Fedora port, updates fixing "this" handling from sparse, wrspif.

wrspice/src/fte/Makefile.in

@@ -34,7 +34,7 @@ CCOBJS = $(CCFILES:.cc=.o)
 INCLUDE = -I../../include -I$(LPATH)/ginterf -I$(LPATH)/miscutil \
   -I$(LPATH)/malloc $(PSINCL)
 
-$(LIB_TARGET): $(CCOBJS)
+$(LIB_TARGET): include $(CCOBJS)
 	@if [ -f $(LIB_TARGET) ]; then \
 	    rm -f $(LIB_TARGET); \
 	fi
@@ -47,6 +47,9 @@ $(LIB_TARGET): $(CCOBJS)
 paramsub.cc: $(LPATH)/spnumber/paramsub.cc
 	cp -f $(LPATH)/spnumber/paramsub.cc .
 
+include:
+	cd ../../include; $(MAKE)
+
 depend: paramsub.cc
 	@echo depending in wrspice/fte
 	@if [ x$(DEPEND_DONE) = x ]; then \
@@ -55,9 +58,9 @@ depend: paramsub.cc
 	fi
 
 clean:
-	-rm *.o $(LIB_TARGET)
+	-rm *.o $(LIB_TARGET) paramsub.cc
 
 distclean:
-	-rm *.o $(LIB_TARGET) Makefile paramsub.cc
+	-rm *.o $(LIB_TARGET) paramsub.cc Makefile
 
 #######################################################################

wrspice/src/fte/source.cc

@@ -2605,7 +2605,7 @@ sLine::process_conditionals(sParamTab *ptab)
         }
         else if (lstring::cimatch(PARAM_KW, dd->li_line)) {
             if (!blhead && !insc) {
-                ptab = ptab->extract_params(dd->li_line);
+                ptab = sParamTab::extract_params(ptab, dd->li_line);
                 if (ptab->errString) {
                     dd->li_error = ptab->errString;
                     ptab->errString = 0;

wrspice/src/fte/subexpand.cc

@@ -368,7 +368,7 @@ sScGlobal::expand_and_replace(sLine *deck, sParamTab **parm_ptr,
             return (0);
         }
         sg_stack[sg_stack_ptr].subs = blk->cb_subs->copy();
-        *parm_ptr = (*parm_ptr)->update(blk->cb_prms);
+        *parm_ptr = sParamTab::update(*parm_ptr, blk->cb_prms);
         IP.setModCache(blk->cb_mods);
 
         // Swap in the cached function definitions.
@@ -487,20 +487,20 @@ sScGlobal::expand_and_replace(sLine *deck, sParamTab **parm_ptr,
             // Above-scope parameter assignments override
             // lower assignments.
 
-            ptab = ptab->update(sss->su_params);
+            ptab = sParamTab::update(ptab, sss->su_params);
             if (params) {
                 if (!ptab)
                     ptab = new sParamTab;
                 ptab->update(params);
             }
-            ptab = ptab->update(*parm_ptr);
+            ptab = sParamTab::update(ptab, *parm_ptr);
         }
         else {
             // The "local" expansion mode, lower level parameter
             // assignments override upper level.
 
-            ptab = ptab->update(*parm_ptr);
-            ptab = ptab->update(sss->su_params);
+            ptab = sParamTab::update(ptab, *parm_ptr);
+            ptab = sParamTab::update(ptab, sss->su_params);
             if (params) {
                 if (!ptab)
                     ptab = new sParamTab;
@@ -2155,7 +2155,7 @@ sSubc::sSubc(sLine *def)
     // First extract params defined in .subckt line.
     su_params = 0;
     if (pars) {
-        su_params = su_params->extract_params(pars);
+        su_params = sParamTab::extract_params(su_params, pars);
         if (sParamTab::errString) {
             def->errcat(sParamTab::errString);
             delete [] sParamTab::errString;
@@ -2169,7 +2169,7 @@ sSubc::sSubc(sLine *def)
 
     for (sLine *li = def; li; li = li->next()) {
         if (lstring::cimatch(PARAM_KW, li->line())) {
-            su_params = su_params->extract_params(li->line());
+            su_params = sParamTab::extract_params(su_params, li->line());
             li->comment_out();
             if (sParamTab::errString) {
                 li->errcat(sParamTab::errString);

wrspice/src/misc/Makefile.in

@@ -26,7 +26,7 @@ CCFILES = \
 CCOBJS = $(CCFILES:.cc=.o)
 INCLUDE = -I../../include -I$(LPATH)/ginterf -I$(LPATH)/miscutil -I$(VLPATH)
 
-$(LIB_TARGET): $(CCOBJS)
+$(LIB_TARGET): include $(CCOBJS)
 	@if [ -f $(LIB_TARGET) ]; then \
 	    rm -f $(LIB_TARGET); \
 	fi
@@ -43,6 +43,9 @@ hash.cc:        $(LPATH)/spnumber/hash.cc
 spnumber.cc:    $(LPATH)/spnumber/spnumber.cc
 spparse.cc:     $(LPATH)/spnumber/spparse.cc
 
+include:
+	cd ../../include; $(MAKE)
+
 depend: $(NFILES)
 	@echo depending in wrspice/misc
 	@if [ x$(DEPEND_DONE) = x ]; then \

wrspice/src/sparse/Makefile.in

@@ -27,7 +27,7 @@ INCLUDE = -I../../include -I$(LPATH)/ginterf -I$(LPATH)/miscutil \
 -I$(KPATH)/AMD/Include -I$(KPATH)/BTF/Include -I$(KPATH)/COLAMD/Include \
 -I$(KPATH)/KLU/Include -I$(KPATH)/SuiteSparse_config
 
-$(LIB_TARGET): $(SP_HFILES) $(CCOBJS)
+$(LIB_TARGET): include $(SP_HFILES) $(CCOBJS)
 	@if [ -f $(LIB_TARGET) ]; then \
 	    rm -f $(LIB_TARGET); \
 	fi
@@ -48,6 +48,9 @@ spoutput.cc:    $(LPATH)/sparse/spoutput.cc
 spsolve.cc:     $(LPATH)/sparse/spsolve.cc
 sputils.cc:     $(LPATH)/sparse/sputils.cc
 
+include:
+	cd ../../include; $(MAKE)
+
 depend: $(SP_HFILES) $(CCFILES)
 	@echo depending in wrspice/sparse
 	@if [ x$(DEPEND_DONE) = x ]; then \

wrspice/src/sparse/spmacros.h

@@ -67,15 +67,6 @@
 #define  AND            &&
 #define  OR             ||
 
-#define  SPARSE_ID      0x772773        // Arbitrary (is Sparse on phone).
-#define  IS_SPARSE(matrix)   ((matrix) != 0 && \
-                              (matrix)->ID == SPARSE_ID)
-#define  IS_VALID(matrix)    ((matrix) != 0 && \
-                              (matrix)->ID == SPARSE_ID && \
-                              (matrix)->Error >= spOKAY && \
-                              (matrix)->Error < spFATAL)
-#define  IS_FACTORED(matrix) ((matrix)->Factored && !(matrix)->NeedsOrdering)
-
 // Macro commands
 // Macro functions that return the maximum or minimum independent of type.
 #ifndef SPMIN

xic/src/sparse/Makefile.in

@@ -23,7 +23,7 @@ CCFILES = spbuild.cc spfactor.cc spsolve.cc sputils.cc
 CCOBJS = $(CCFILES:.cc=.o)
 INCLUDE = -I../../include -I$(LPATH)/miscutil
 
-$(LIB_TARGET): $(HFILES) $(CCOBJS)
+$(LIB_TARGET): include $(HFILES) $(CCOBJS)
 	@if [ -f $(LIB_TARGET) ]; then \
 	    rm -f $(LIB_TARGET); \
 	fi
@@ -43,6 +43,9 @@ spfactor.cc:    $(LPATH)/sparse/spfactor.cc
 spsolve.cc:     $(LPATH)/sparse/spsolve.cc
 sputils.cc:     $(LPATH)/sparse/sputils.cc
 
+include:
+	cd ../../include; $(MAKE)
+
 depend: $(HFILES) $(CCFILES)
 	@echo depending in xic/sparse
 	@if [ x$(DEPEND_DONE) = x ]; then \

xic/src/wrspif/Makefile.in

@@ -24,7 +24,7 @@ CCFILES = $(SPFILES)
 CCOBJS = $(CCFILES:.cc=.o)
 INCLUDE = -I../../include -I$(LPATH)/ginterf -I$(LPATH)/miscutil
 
-$(LIB_TARGET): $(CCOBJS)
+$(LIB_TARGET): include $(CCOBJS)
 	@if [ -f $(LIB_TARGET) ]; then \
 	    rm -f $(LIB_TARGET); \
 	fi
@@ -42,6 +42,9 @@ paramsub.cc:    $(LPATH)/spnumber/paramsub.cc
 spnumber.cc:    $(LPATH)/spnumber/spnumber.cc
 spparse.cc:     $(LPATH)/spnumber/spparse.cc
 
+include:
+	cd ../../include; $(MAKE)
+
 depend: $(SPFILES)
 	@echo depending in xic/wrspif
 	@if [ x$(DEPEND_DONE) = x ]; then \

xt_base/sparse/spbuild.cc

@@ -224,7 +224,6 @@ spMatrixFrame::spMatrixFrame(int size, int flags)
 
     RelThreshold                    = DEFAULT_THRESHOLD;
     AbsThreshold                    = 0.0;
-    ID                              = SPARSE_ID;
 #if SP_OPT_INTERRUPT
     InterruptCallback               = 0;
 #endif
@@ -300,8 +299,6 @@ spMatrixFrame::spMatrixFrame(int size, int flags)
 //
 spMatrixFrame::~spMatrixFrame()
 {
-    ASSERT(IS_SPARSE(this));
-
     // Deallocate the vectors that are located in the matrix frame.
     delete [] FirstInCol;
     delete [] FirstInRow;
@@ -339,8 +336,6 @@ spMatrixFrame::~spMatrixFrame()
 void
 spMatrixFrame::spClear()
 {
-    ASSERT(IS_SPARSE(this));
-
     if (Matrix)
         Matrix->clear();
     else {
@@ -406,7 +401,7 @@ spMatrixFrame::spClear()
 spREAL *
 spMatrixFrame::spGetElement(int inrow, int incol)
 {
-    ASSERT(IS_SPARSE(this) AND inrow >= 0 AND incol >= 0);
+    ASSERT(inrow >= 0 AND incol >= 0);
 
     if ((inrow == 0) OR (incol == 0))
         return (&TrashCan.Real);
@@ -822,8 +817,6 @@ spGetInitInfo(spREAL *pElement)
 int
 spMatrixFrame::spInitialize(spInitializeFunc pInit)
 {
-    ASSERT(IS_SPARSE(this));
-
     // Initialize the matrix
     for (int j = Size; j > 0; j--) {
         spMatrixElement *pElement = FirstInCol[j];
@@ -1408,11 +1401,6 @@ spHtab::~spHtab()
 spMatrixElement *
 spHtab::get(int row, int col)
 {
-    {
-        spHtab *ht = this;
-        if (!ht)
-            return (0);
-    }
     if (allocated) {
         getcalls++;
         unsigned int i = number_hash(row, col, mask);
@@ -1440,16 +1428,6 @@ spHtab::link(spHelt *h)
 void
 spHtab::stats(unsigned int *pg, unsigned int *pa)
 {
-    {
-        spHtab *ht = this;
-        if (!ht) {
-            if (pg)
-                *pg = 0;
-            if (pa)
-                *pa = 0;
-            return;
-        }
-    }
     if (pg)
         *pg = getcalls;
     if (pa)

xt_base/sparse/spfactor.cc

@@ -241,7 +241,7 @@ int
 spMatrixFrame::spOrderAndFactor(spREAL *rhs, spREAL relThreshold,
     spREAL absThreshold, spBOOLEAN diagPivoting)
 {
-    ASSERT(IS_VALID(this) AND NOT Factored);
+    ASSERT(NOT Factored);
 
     Error = spOKAY;
     ReorderFailed = NO;
@@ -436,7 +436,7 @@ spMatrixFrame::spOrderAndFactor(spREAL *rhs, spREAL relThreshold,
 int
 spMatrixFrame::spFactor()
 {
-    ASSERT(IS_VALID(this) AND NOT Factored);
+    ASSERT(NOT Factored);
 
     if (NeedsOrdering)
         return (spOrderAndFactor(0, 0.0, 0.0, DIAG_PIVOTING_AS_DEFAULT));
@@ -1277,7 +1277,6 @@ spMatrixFrame::FactorComplexMatrix()
 void
 spMatrixFrame::spPartition(int mode)
 {
-    ASSERT(IS_SPARSE(this));
     if (Partitioned)
         return;
     Partitioned = YES;

xt_base/sparse/spmacros.h

@@ -67,15 +67,6 @@
 #define  AND            &&
 #define  OR             ||
 
-#define  SPARSE_ID      0x772773        // Arbitrary (is Sparse on phone).
-#define  IS_SPARSE(matrix)   ((matrix) != 0 && \
-                              (matrix)->ID == SPARSE_ID)
-#define  IS_VALID(matrix)    ((matrix) != 0 && \
-                              (matrix)->ID == SPARSE_ID && \
-                              (matrix)->Error >= spOKAY && \
-                              (matrix)->Error < spFATAL)
-#define  IS_FACTORED(matrix) ((matrix)->Factored && !(matrix)->NeedsOrdering)
-
 // Macro commands
 // Macro functions that return the maximum or minimum independent of type.
 #ifndef SPMIN

xt_base/sparse/spmatrix.h

@@ -1129,6 +1129,9 @@ class  spMatrixFrame
         }
 
 #endif
+    // Former macros.
+    spBOOLEAN IS_VALID()    { return (Error >= spOKAY && Error < spFATAL); }
+    spBOOLEAN IS_FACTORED() { return (Factored && !NeedsOrdering); }
 
     spBOOLEAN spNeedsOrdering()
         {
@@ -1339,14 +1342,21 @@ class  spMatrixFrame
     //
     spMatrixElement *sph_get(int row, int col)
         {
-            return (ElementHashTab->get(row, col));
+            return (ElementHashTab ? ElementHashTab->get(row, col) : 0);
         }
 
     // Return the sph_get call count and the allocated size.  The call
     // count is zeroed.
     //
     void sph_stats(unsigned int *pg, unsigned int *pa)
         {
+            if (!ElementHashTab) {
+                if (pg)
+                    *pg = 0;
+                if (pa)
+                    *pa = 0;
+                return;
+            }
             ElementHashTab->stats(pg, pa);
         }
 
@@ -1509,7 +1519,6 @@ class  spMatrixFrame
     spREAL                      RelThreshold;
     spREAL                      AbsThreshold;
     spMatrixElement             TrashCan;
-    unsigned long               ID;
 #if SP_OPT_INTERRUPT
     int                         (*InterruptCallback)();
 #endif

xt_base/sparse/spoutput.cc

@@ -175,8 +175,6 @@ void
 spMatrixFrame::spPrint(int printReordered, int data, int header, FILE *fp)
 #endif
 {
-    ASSERT(IS_SPARSE(this));
-
     double *pImagElements[PRINTER_WIDTH/10+1];
     double smallestDiag = 0.0, smallestElement = 0.0;
     double largestElement = 0.0, largestDiag = 0.0;
@@ -437,8 +435,6 @@ spMatrixFrame::spPrint(int printReordered, int data, int header, FILE *fp)
 void
 spMatrixFrame::spPrint(int printReordered, int data, int header)
 {
-    ASSERT(IS_SPARSE(this));
-
     double *pImagElements[PRINTER_WIDTH/10+1];
     double smallestDiag = 0.0, smallestElement = 0.0;
     double largestElement = 0.0, largestDiag = 0.0;
@@ -735,8 +731,6 @@ int
 spMatrixFrame::spFileMatrix(char *file, char *label, int reordered, int data,
     int header)
 {
-    ASSERT(IS_SPARSE(this));
-
     // Open file matrix file in write mode.
     FILE *pMatrixFile;
     if ((pMatrixFile = fopen(file, "w")) == 0)
@@ -891,7 +885,7 @@ spMatrixFrame::spFileMatrix(char *file, char *label, int reordered, int data,
 int
 spMatrixFrame::spFileVector(char *file, spREAL *rhs IMAG_RHS_P)
 {
-    ASSERT(IS_SPARSE(this) AND RHS != 0)
+    ASSERT(RHS != 0)
 
     // Open File in append mode.
     FILE *pMatrixFile;
@@ -998,8 +992,6 @@ spMatrixFrame::spFileVector(char *file, spREAL *rhs IMAG_RHS_P)
 int
 spMatrixFrame::spFileStats(char *file, char *label)
 {
-    ASSERT(IS_SPARSE(this));
-
     // Open File in append mode
     FILE *pStatsFile;
     if ((pStatsFile = fopen(file, "a")) == 0)