From 9819983733e5c7c41379c2cab6a2b7abbedbe187 Mon Sep 17 00:00:00 2001
From: arno <arno>
Date: Tue, 11 Jul 2000 13:39:04 +0000
Subject: [PATCH] 	* Removed unnecessary 'register' keywords.

---
 src/spicelib/devices/asrc/asrcacld.c      |   4 +-
 src/spicelib/devices/asrc/asrcask.c       |   2 +-
 src/spicelib/devices/asrc/asrcconv.c      |   4 +-
 src/spicelib/devices/asrc/asrcdel.c       |   2 +-
 src/spicelib/devices/asrc/asrcfbr.c       |   8 +-
 src/spicelib/devices/asrc/asrcload.c      |  57 +-
 src/spicelib/devices/asrc/asrcmdel.c      |  10 +-
 src/spicelib/devices/asrc/asrcpar.c       |   2 +-
 src/spicelib/devices/asrc/asrcpzld.c      |   4 +-
 src/spicelib/devices/asrc/asrcset.c       |   8 +-
 src/spicelib/devices/bjt/bjtacld.c        |   6 +-
 src/spicelib/devices/bjt/bjtconv.c        |   6 +-
 src/spicelib/devices/bjt/bjtdisto.c       |   4 +-
 src/spicelib/devices/bjt/bjtdset.c        |   4 +-
 src/spicelib/devices/bjt/bjtgetic.c       |   4 +-
 src/spicelib/devices/bjt/bjtload.c        |  25 +-
 src/spicelib/devices/bjt/bjtnoise.c       |   6 +-
 src/spicelib/devices/bjt/bjtparam.c       |   2 +-
 src/spicelib/devices/bjt/bjtpzld.c        |   8 +-
 src/spicelib/devices/bjt/bjtsacl.c        |   4 +-
 src/spicelib/devices/bjt/bjtsetup.c       |   6 +-
 src/spicelib/devices/bjt/bjtsload.c       |   4 +-
 src/spicelib/devices/bjt/bjtsprt.c        |   6 +-
 src/spicelib/devices/bjt/bjtsset.c        |   6 +-
 src/spicelib/devices/bjt/bjtsupd.c        |   6 +-
 src/spicelib/devices/bjt/bjttemp.c        |   4 +-
 src/spicelib/devices/bjt/bjttrunc.c       |   6 +-
 src/spicelib/devices/bsim1/b1acld.c       |   6 +-
 src/spicelib/devices/bsim1/b1cvtest.c     |   6 +-
 src/spicelib/devices/bsim1/b1disto.c      |   4 +-
 src/spicelib/devices/bsim1/b1dset.c       |   6 +-
 src/spicelib/devices/bsim1/b1eval.c       |   6 +-
 src/spicelib/devices/bsim1/b1ld.c         |  25 +-
 src/spicelib/devices/bsim1/b1moscap.c     |   2 +-
 src/spicelib/devices/bsim1/b1pzld.c       |   8 +-
 src/spicelib/devices/bsim1/b1set.c        |  10 +-
 src/spicelib/devices/bsim1/b1temp.c       |   4 +-
 src/spicelib/devices/bsim1/b1trunc.c      |   6 +-
 src/spicelib/devices/bsim2/b2acld.c       |   6 +-
 src/spicelib/devices/bsim2/b2cvtest.c     |   6 +-
 src/spicelib/devices/bsim2/b2eval.c       |   6 +-
 src/spicelib/devices/bsim2/b2ld.c         |  25 +-
 src/spicelib/devices/bsim2/b2moscap.c     |   2 +-
 src/spicelib/devices/bsim2/b2pzld.c       |   8 +-
 src/spicelib/devices/bsim2/b2set.c        |  10 +-
 src/spicelib/devices/bsim2/b2temp.c       |   6 +-
 src/spicelib/devices/bsim2/b2trunc.c      |   6 +-
 src/spicelib/devices/bsim3/b3acld.c       |   6 +-
 src/spicelib/devices/bsim3/b3check.c      |   4 +-
 src/spicelib/devices/bsim3/b3cvtest.c     |   6 +-
 src/spicelib/devices/bsim3/b3ld.c         |  31 +-
 src/spicelib/devices/bsim3/b3noi.c        |   6 +-
 src/spicelib/devices/bsim3/b3pzld.c       |   8 +-
 src/spicelib/devices/bsim3/b3set.c        |  10 +-
 src/spicelib/devices/bsim3/b3temp.c       |   4 +-
 src/spicelib/devices/bsim3/b3trunc.c      |   6 +-
 src/spicelib/devices/bsim3v1/b3v1acld.c   |   6 +-
 src/spicelib/devices/bsim3v1/b3v1check.c  |   4 +-
 src/spicelib/devices/bsim3v1/b3v1cvtest.c |   6 +-
 src/spicelib/devices/bsim3v1/b3v1ld.c     |  26 +-
 src/spicelib/devices/bsim3v1/b3v1noi.c    |   6 +-
 src/spicelib/devices/bsim3v1/b3v1pzld.c   |   8 +-
 src/spicelib/devices/bsim3v1/b3v1set.c    |  10 +-
 src/spicelib/devices/bsim3v1/b3v1temp.c   |   4 +-
 src/spicelib/devices/bsim3v1/b3v1trunc.c  |   6 +-
 src/spicelib/devices/bsim3v2/b3v2acld.c   |   6 +-
 src/spicelib/devices/bsim3v2/b3v2check.c  |   4 +-
 src/spicelib/devices/bsim3v2/b3v2cvtest.c |   6 +-
 src/spicelib/devices/bsim3v2/b3v2ld.c     |  37 +-
 src/spicelib/devices/bsim3v2/b3v2noi.c    |   6 +-
 src/spicelib/devices/bsim3v2/b3v2pzld.c   |   8 +-
 src/spicelib/devices/bsim3v2/b3v2set.c    |  10 +-
 src/spicelib/devices/bsim3v2/b3v2temp.c   |   4 +-
 src/spicelib/devices/bsim3v2/b3v2trunc.c  |   6 +-
 src/spicelib/devices/bsim4/b4acld.c       |   6 +-
 src/spicelib/devices/bsim4/b4check.c      |   4 +-
 src/spicelib/devices/bsim4/b4cvtest.c     |   6 +-
 src/spicelib/devices/bsim4/b4ld.c         |  48 +-
 src/spicelib/devices/bsim4/b4noi.c        |   6 +-
 src/spicelib/devices/bsim4/b4pzld.c       |   8 +-
 src/spicelib/devices/bsim4/b4set.c        |  10 +-
 src/spicelib/devices/bsim4/b4temp.c       |   4 +-
 src/spicelib/devices/bsim4/b4trunc.c      |   6 +-
 src/spicelib/devices/cap/capacld.c        |   6 +-
 src/spicelib/devices/cap/capload.c        |   8 +-
 src/spicelib/devices/cap/cappzld.c        |   6 +-
 src/spicelib/devices/cap/capsacl.c        |   6 +-
 src/spicelib/devices/cap/capsetup.c       |   6 +-
 src/spicelib/devices/cap/capsload.c       |   6 +-
 src/spicelib/devices/cap/capsprt.c        |   6 +-
 src/spicelib/devices/cap/capsset.c        |   6 +-
 src/spicelib/devices/cap/capsupd.c        |   6 +-
 src/spicelib/devices/cap/captemp.c        |   4 +-
 src/spicelib/devices/cap/captrunc.c       |   8 +-
 src/spicelib/devices/cccs/cccsload.c      |   4 +-
 src/spicelib/devices/cccs/cccspzld.c      |   4 +-
 src/spicelib/devices/cccs/cccssacl.c      |   4 +-
 src/spicelib/devices/cccs/cccsset.c       |   8 +-
 src/spicelib/devices/cccs/cccssld.c       |   4 +-
 src/spicelib/devices/cccs/cccssprt.c      |   6 +-
 src/spicelib/devices/cccs/cccssset.c      |   6 +-
 src/spicelib/devices/ccvs/ccvsfbr.c       |   8 +-
 src/spicelib/devices/ccvs/ccvsload.c      |   4 +-
 src/spicelib/devices/ccvs/ccvspzld.c      |   4 +-
 src/spicelib/devices/ccvs/ccvssacl.c      |   4 +-
 src/spicelib/devices/ccvs/ccvsset.c       |   8 +-
 src/spicelib/devices/ccvs/ccvssld.c       |   4 +-
 src/spicelib/devices/ccvs/ccvssprt.c      |   6 +-
 src/spicelib/devices/ccvs/ccvssset.c      |   6 +-
 src/spicelib/devices/csw/cswacld.c        |   6 +-
 src/spicelib/devices/csw/cswload.c        |   6 +-
 src/spicelib/devices/csw/cswnoise.c       |   6 +-
 src/spicelib/devices/csw/cswpzld.c        |   6 +-
 src/spicelib/devices/csw/cswsetup.c       |   6 +-
 src/spicelib/devices/dio/dioacld.c        |   6 +-
 src/spicelib/devices/dio/dioconv.c        |   4 +-
 src/spicelib/devices/dio/diodisto.c       |   4 +-
 src/spicelib/devices/dio/diodset.c        |   4 +-
 src/spicelib/devices/dio/dioload.c        |  16 +-
 src/spicelib/devices/dio/dionoise.c       |   6 +-
 src/spicelib/devices/dio/diopzld.c        |   6 +-
 src/spicelib/devices/dio/diosacl.c        |   4 +-
 src/spicelib/devices/dio/diosetup.c       |   6 +-
 src/spicelib/devices/dio/diosload.c       |   4 +-
 src/spicelib/devices/dio/diosprt.c        |   6 +-
 src/spicelib/devices/dio/diosset.c        |   6 +-
 src/spicelib/devices/dio/diosupd.c        |   6 +-
 src/spicelib/devices/dio/diotemp.c        |   8 +-
 src/spicelib/devices/dio/diotrunc.c       |   6 +-
 src/spicelib/devices/ind/indacld.c        |   6 +-
 src/spicelib/devices/ind/indload.c        |  10 +-
 src/spicelib/devices/ind/indpzld.c        |   4 +-
 src/spicelib/devices/ind/indsacl.c        |  10 +-
 src/spicelib/devices/ind/indsetup.c       |   6 +-
 src/spicelib/devices/ind/indsload.c       |  10 +-
 src/spicelib/devices/ind/indsprt.c        |   6 +-
 src/spicelib/devices/ind/indsset.c        |   6 +-
 src/spicelib/devices/ind/indsupd.c        |  10 +-
 src/spicelib/devices/ind/indtrunc.c       |   8 +-
 src/spicelib/devices/ind/mutacld.c        |   6 +-
 src/spicelib/devices/ind/mutpzld.c        |   6 +-
 src/spicelib/devices/ind/mutsetup.c       |   6 +-
 src/spicelib/devices/ind/mutsprt.c        |   4 +-
 src/spicelib/devices/ind/mutsset.c        |   6 +-
 src/spicelib/devices/isrc/isrcacct.c      |   8 +-
 src/spicelib/devices/isrc/isrcacld.c      |   6 +-
 src/spicelib/devices/isrc/isrcload.c      |   8 +-
 src/spicelib/devices/isrc/isrctemp.c      |   4 +-
 src/spicelib/devices/jfet/jfetacld.c      |   6 +-
 src/spicelib/devices/jfet/jfetdist.c      |   4 +-
 src/spicelib/devices/jfet/jfetdset.c      |   4 +-
 src/spicelib/devices/jfet/jfetload.c      |  21 +-
 src/spicelib/devices/jfet/jfetnoi.c       |   6 +-
 src/spicelib/devices/jfet/jfetpzld.c      |   8 +-
 src/spicelib/devices/jfet/jfetset.c       |   6 +-
 src/spicelib/devices/jfet/jfettemp.c      |   4 +-
 src/spicelib/devices/jfet/jfettrun.c      |   6 +-
 src/spicelib/devices/jfet2/jfet2acld.c    |   6 +-
 src/spicelib/devices/jfet2/jfet2load.c    |  18 +-
 src/spicelib/devices/jfet2/jfet2noi.c     |   6 +-
 src/spicelib/devices/jfet2/jfet2set.c     |   6 +-
 src/spicelib/devices/jfet2/jfet2temp.c    |   4 +-
 src/spicelib/devices/jfet2/jfet2trun.c    |   6 +-
 src/spicelib/devices/ltra/ltraacct.c      |   6 +-
 src/spicelib/devices/ltra/ltraacld.c      |   4 +-
 src/spicelib/devices/ltra/ltraload.c      |   8 +-
 src/spicelib/devices/ltra/ltramisc.c      |   6 +-
 src/spicelib/devices/ltra/ltraset.c       |   8 +-
 src/spicelib/devices/ltra/ltratemp.c      |   4 +-
 src/spicelib/devices/ltra/ltratrun.c      |   6 +-
 src/spicelib/devices/mes/mesacl.c         |   6 +-
 src/spicelib/devices/mes/mesdisto.c       |   4 +-
 src/spicelib/devices/mes/mesdset.c        |   4 +-
 src/spicelib/devices/mes/mesload.c        |  18 +-
 src/spicelib/devices/mes/mesnoise.c       |   6 +-
 src/spicelib/devices/mes/mespzld.c        |   6 +-
 src/spicelib/devices/mes/messetup.c       |   6 +-
 src/spicelib/devices/mes/mestemp.c        |   2 +-
 src/spicelib/devices/mes/mestrunc.c       |   6 +-
 src/spicelib/devices/mos1/mos1acld.c      |   6 +-
 src/spicelib/devices/mos1/mos1conv.c      |   6 +-
 src/spicelib/devices/mos1/mos1dist.c      |   4 +-
 src/spicelib/devices/mos1/mos1dset.c      |   9 +-
 src/spicelib/devices/mos1/mos1load.c      | 611 +++++++++-------------
 src/spicelib/devices/mos1/mos1mpar.c      |   2 +-
 src/spicelib/devices/mos1/mos1noi.c       |   6 +-
 src/spicelib/devices/mos1/mos1pzld.c      |   6 +-
 src/spicelib/devices/mos1/mos1sacl.c      |   6 +-
 src/spicelib/devices/mos1/mos1set.c       |   8 +-
 src/spicelib/devices/mos1/mos1sld.c       |   4 +-
 src/spicelib/devices/mos1/mos1sprt.c      |   6 +-
 src/spicelib/devices/mos1/mos1sset.c      |   6 +-
 src/spicelib/devices/mos1/mos1supd.c      |   6 +-
 src/spicelib/devices/mos1/mos1temp.c      |   6 +-
 src/spicelib/devices/mos1/mos1trun.c      |   6 +-
 src/spicelib/devices/mos2/mos2acld.c      |   6 +-
 src/spicelib/devices/mos2/mos2conv.c      |   6 +-
 src/spicelib/devices/mos2/mos2dist.c      |   4 +-
 src/spicelib/devices/mos2/mos2dset.c      |   6 +-
 src/spicelib/devices/mos2/mos2load.c      |  75 +--
 src/spicelib/devices/mos2/mos2mask.c      |   2 +-
 src/spicelib/devices/mos2/mos2mpar.c      |   2 +-
 src/spicelib/devices/mos2/mos2noi.c       |   6 +-
 src/spicelib/devices/mos2/mos2pzld.c      |   6 +-
 src/spicelib/devices/mos2/mos2sacl.c      |   6 +-
 src/spicelib/devices/mos2/mos2set.c       |   8 +-
 src/spicelib/devices/mos2/mos2sld.c       |   4 +-
 src/spicelib/devices/mos2/mos2sprt.c      |   6 +-
 src/spicelib/devices/mos2/mos2sset.c      |   6 +-
 src/spicelib/devices/mos2/mos2supd.c      |   6 +-
 src/spicelib/devices/mos2/mos2temp.c      |   6 +-
 src/spicelib/devices/mos2/mos2trun.c      |   6 +-
 src/spicelib/devices/mos3/mos3acld.c      |   6 +-
 src/spicelib/devices/mos3/mos3conv.c      |   6 +-
 src/spicelib/devices/mos3/mos3dist.c      |   4 +-
 src/spicelib/devices/mos3/mos3dset.c      |   6 +-
 src/spicelib/devices/mos3/mos3load.c      | 120 +----
 src/spicelib/devices/mos3/mos3mpar.c      |   2 +-
 src/spicelib/devices/mos3/mos3noi.c       |   6 +-
 src/spicelib/devices/mos3/mos3pzld.c      |   6 +-
 src/spicelib/devices/mos3/mos3sacl.c      |   6 +-
 src/spicelib/devices/mos3/mos3set.c       |   8 +-
 src/spicelib/devices/mos3/mos3sld.c       |   4 +-
 src/spicelib/devices/mos3/mos3sprt.c      |   6 +-
 src/spicelib/devices/mos3/mos3sset.c      |   6 +-
 src/spicelib/devices/mos3/mos3supd.c      |   6 +-
 src/spicelib/devices/mos3/mos3temp.c      |   6 +-
 src/spicelib/devices/mos3/mos3trun.c      |   6 +-
 src/spicelib/devices/mos6/mos6conv.c      |   6 +-
 src/spicelib/devices/mos6/mos6load.c      | 106 +---
 src/spicelib/devices/mos6/mos6mask.c      |   2 +-
 src/spicelib/devices/mos6/mos6mpar.c      |   2 +-
 src/spicelib/devices/mos6/mos6set.c       |   8 +-
 src/spicelib/devices/mos6/mos6temp.c      |   6 +-
 src/spicelib/devices/mos6/mos6trun.c      |   6 +-
 src/spicelib/devices/sw/swacload.c        |   6 +-
 src/spicelib/devices/sw/swload.c          |   6 +-
 src/spicelib/devices/sw/swnoise.c         |   6 +-
 src/spicelib/devices/sw/swpzload.c        |   6 +-
 src/spicelib/devices/sw/swsetup.c         |   6 +-
 src/spicelib/devices/tra/traacct.c        |   8 +-
 src/spicelib/devices/tra/traacld.c        |   4 +-
 src/spicelib/devices/tra/traload.c        |   6 +-
 src/spicelib/devices/tra/trasetup.c       |   8 +-
 src/spicelib/devices/tra/tratemp.c        |   4 +-
 src/spicelib/devices/tra/tratrunc.c       |   6 +-
 src/spicelib/devices/urc/urcmpar.c        |   2 +-
 src/spicelib/devices/urc/urcsetup.c       |   4 +-
 src/spicelib/devices/vccs/vccsload.c      |   4 +-
 src/spicelib/devices/vccs/vccspzld.c      |   4 +-
 src/spicelib/devices/vccs/vccssacl.c      |   4 +-
 src/spicelib/devices/vccs/vccsset.c       |   6 +-
 src/spicelib/devices/vccs/vccssld.c       |   4 +-
 src/spicelib/devices/vccs/vccssprt.c      |   6 +-
 src/spicelib/devices/vccs/vccssset.c      |   6 +-
 src/spicelib/devices/vcvs/vcvsfbr.c       |   8 +-
 src/spicelib/devices/vcvs/vcvsload.c      |   4 +-
 src/spicelib/devices/vcvs/vcvspzld.c      |   4 +-
 src/spicelib/devices/vcvs/vcvssacl.c      |   4 +-
 src/spicelib/devices/vcvs/vcvsset.c       |   8 +-
 src/spicelib/devices/vcvs/vcvssld.c       |   4 +-
 src/spicelib/devices/vcvs/vcvssprt.c      |   6 +-
 src/spicelib/devices/vcvs/vcvssset.c      |   6 +-
 src/spicelib/devices/vsrc/vsrcacct.c      |   8 +-
 src/spicelib/devices/vsrc/vsrcacld.c      |   6 +-
 src/spicelib/devices/vsrc/vsrcfbr.c       |   8 +-
 src/spicelib/devices/vsrc/vsrcload.c      |   8 +-
 src/spicelib/devices/vsrc/vsrcpzld.c      |   4 +-
 src/spicelib/devices/vsrc/vsrcpzs.c       |  21 +-
 src/spicelib/devices/vsrc/vsrcset.c       |   8 +-
 src/spicelib/devices/vsrc/vsrctemp.c      |   4 +-
 271 files changed, 1069 insertions(+), 1666 deletions(-)

diff --git a/src/spicelib/devices/asrc/asrcacld.c b/src/spicelib/devices/asrc/asrcacld.c
index eb941a2c2..c3c115d91 100644
--- a/src/spicelib/devices/asrc/asrcacld.c
+++ b/src/spicelib/devices/asrc/asrcacld.c
@@ -25,8 +25,8 @@ ASRCacLoad(GENmodel *inModel, CKTcircuit *ckt)
      * been precomputed and stored with the instance model.
      */
 
-    register ASRCmodel *model = (ASRCmodel*)inModel;
-    register ASRCinstance *here;
+    ASRCmodel *model = (ASRCmodel*)inModel;
+    ASRCinstance *here;
     int i, v_first, j;
     double *derivs;
     double rhs;
diff --git a/src/spicelib/devices/asrc/asrcask.c b/src/spicelib/devices/asrc/asrcask.c
index 8059aed46..0656de0ed 100644
--- a/src/spicelib/devices/asrc/asrcask.c
+++ b/src/spicelib/devices/asrc/asrcask.c
@@ -30,7 +30,7 @@ ASRCask(ckt,instPtr,which,value,select)
     IFvalue *value;
     IFvalue *select;
 {
-    register ASRCinstance *here = (ASRCinstance*)instPtr;
+    ASRCinstance *here = (ASRCinstance*)instPtr;
 
     switch(which) {
         case ASRC_CURRENT:
diff --git a/src/spicelib/devices/asrc/asrcconv.c b/src/spicelib/devices/asrc/asrcconv.c
index 95afcb913..665b6f748 100644
--- a/src/spicelib/devices/asrc/asrcconv.c
+++ b/src/spicelib/devices/asrc/asrcconv.c
@@ -15,8 +15,8 @@ ASRCconvTest( inModel, ckt)
 GENmodel *inModel;
 CKTcircuit *ckt;
 {
-    register ASRCmodel *model = (ASRCmodel *)inModel;
-    register ASRCinstance *here;
+    ASRCmodel *model = (ASRCmodel *)inModel;
+    ASRCinstance *here;
     int i, node_num, branch;
     double diff;
     double prev;
diff --git a/src/spicelib/devices/asrc/asrcdel.c b/src/spicelib/devices/asrc/asrcdel.c
index ebfb5e79f..ee3714902 100644
--- a/src/spicelib/devices/asrc/asrcdel.c
+++ b/src/spicelib/devices/asrc/asrcdel.c
@@ -20,7 +20,7 @@ ASRCdelete(model,name,fast)
     GENinstance **fast;
 
 {
-    register ASRCinstance **instPtr = (ASRCinstance**)fast;
+    ASRCinstance **instPtr = (ASRCinstance**)fast;
     ASRCmodel *modPtr = (ASRCmodel*)model;
 
     ASRCinstance **prev = NULL;
diff --git a/src/spicelib/devices/asrc/asrcfbr.c b/src/spicelib/devices/asrc/asrcfbr.c
index d3f05cb51..94c2ed05d 100644
--- a/src/spicelib/devices/asrc/asrcfbr.c
+++ b/src/spicelib/devices/asrc/asrcfbr.c
@@ -17,12 +17,12 @@ Author: 1987 Kanwar Jit Singh
 
 int
 ASRCfindBr(ckt,inputModel,name)
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     GENmodel *inputModel;
-    register IFuid name;
+    IFuid name;
 {
-    register ASRCinstance *here;
-    register ASRCmodel *model = (ASRCmodel*)inputModel;
+    ASRCinstance *here;
+    ASRCmodel *model = (ASRCmodel*)inputModel;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/asrc/asrcload.c b/src/spicelib/devices/asrc/asrcload.c
index 04717c527..2a7613f62 100644
--- a/src/spicelib/devices/asrc/asrcload.c
+++ b/src/spicelib/devices/asrc/asrcload.c
@@ -27,8 +27,8 @@ CKTcircuit *ckt;
      * sparse matrix previously provided 
      */
 
-    register ASRCmodel *model = (ASRCmodel*)inModel;
-    register ASRCinstance *here;
+    ASRCmodel *model = (ASRCmodel*)inModel;
+    ASRCinstance *here;
     int i, v_first, j, branch;
     int node_num;
     int size;
@@ -39,7 +39,7 @@ CKTcircuit *ckt;
 
         /* loop through all the instances of the model */
         for (here = model->ASRCinstances; here != NULL ;
-                here=here->ASRCnextInstance)
+	     here=here->ASRCnextInstance)
 	{
 	    if (here->ASRCowner != ARCHme) continue;
             
@@ -49,13 +49,13 @@ CKTcircuit *ckt;
 	    v_first = 1;
 	    i = here->ASRCtree->numVars;
 	    if (asrc_nvals < i) {
-		    if (asrc_nvals) {
-			    FREE(asrc_vals);
-			    FREE(asrc_derivs);
-		    }
-		    asrc_nvals = i;
-		    asrc_vals = NEWN(double, i);
-		    asrc_derivs = NEWN(double, i);
+		if (asrc_nvals) {
+		    FREE(asrc_vals);
+		    FREE(asrc_derivs);
+		}
+		asrc_nvals = i;
+		asrc_vals = NEWN(double, i);
+		asrc_derivs = NEWN(double, i);
 	    }
 
 	    j=0;
@@ -65,42 +65,21 @@ CKTcircuit *ckt;
 	     */
 	    for( i=0; i < here->ASRCtree->numVars; i++){
 		if( here->ASRCtree->varTypes[i] == IF_INSTANCE){
-		 branch = CKTfndBranch(ckt,
-		    here->ASRCtree->vars[i].uValue);
-		 asrc_vals[i] = *(ckt->CKTrhsOld+branch);
+		    branch = CKTfndBranch(ckt,
+					  here->ASRCtree->vars[i].uValue);
+		    asrc_vals[i] = *(ckt->CKTrhsOld+branch);
 		} else {
-		node_num = ((CKTnode *)(here->ASRCtree->vars[i].
-		nValue))->number;
-		asrc_vals[i] = *(ckt->CKTrhsOld+node_num);
+		    node_num = ((CKTnode *)(here->ASRCtree->vars[i].
+					    nValue))->number;
+		    asrc_vals[i] = *(ckt->CKTrhsOld+node_num);
 		}
 	    }
 
 	    if ((*(here->ASRCtree->IFeval))(here->ASRCtree,ckt->CKTgmin, &rhs,
-		asrc_vals,asrc_derivs) == OK)
+					    asrc_vals,asrc_derivs) == OK)
 	    {
 
 		/* The convergence test */
-
-		if ( (ckt->CKTmode & MODEINITFIX) || 
-		    (ckt->CKTmode & MODEINITFLOAT) )
-		{
-#ifndef NEWCONV
-		    prev = here->ASRCprev_value;
-		    diff = fabs( prev - rhs);
-		    if ( here->ASRCtype == ASRC_VOLTAGE) {
-			tol = ckt->CKTreltol *
-			    MAX(fabs(rhs),fabs(prev)) + ckt->CKTvoltTol;
-		    } else {
-			tol = ckt->CKTreltol *
-			    MAX(fabs(rhs),fabs(prev)) + ckt->CKTabstol;
-		    }
-
-		    if ( diff > tol) {
-			ckt->CKTnoncon++;
-			ckt->CKTtroubleElt = (GENinstance *) here;
-		    }
-#endif /* NEWCONV */
-		}
 		here->ASRCprev_value = rhs;
 
 		/* The ac load precomputation and storage */
@@ -109,7 +88,7 @@ CKTcircuit *ckt;
 		    size = (here->ASRCtree->numVars)+1 ;
 		    here->ASRCacValues = NEWN(double, size);
 		    for ( i = 0; i < here->ASRCtree->numVars; i++){
-			    here->ASRCacValues[i] = asrc_derivs[i]; 
+			here->ASRCacValues[i] = asrc_derivs[i]; 
 		    }
 		}
 
diff --git a/src/spicelib/devices/asrc/asrcmdel.c b/src/spicelib/devices/asrc/asrcmdel.c
index 20d6825f4..2a68253c8 100644
--- a/src/spicelib/devices/asrc/asrcmdel.c
+++ b/src/spicelib/devices/asrc/asrcmdel.c
@@ -21,11 +21,11 @@ ASRCmDelete(modList,modname,killModel)
 
 {
 
-    register ASRCmodel **model = (ASRCmodel**)modList;
-    register ASRCmodel *modfast = (ASRCmodel*)killModel;
-    register ASRCinstance *here;
-    register ASRCinstance *prev = NULL;
-    register ASRCmodel **oldmod;
+    ASRCmodel **model = (ASRCmodel**)modList;
+    ASRCmodel *modfast = (ASRCmodel*)killModel;
+    ASRCinstance *here;
+    ASRCinstance *prev = NULL;
+    ASRCmodel **oldmod;
     oldmod = model;
     for( ; *model ; model = &((*model)->ASRCnextModel)) {
         if( (*model)->ASRCmodName == modname || 
diff --git a/src/spicelib/devices/asrc/asrcpar.c b/src/spicelib/devices/asrc/asrcpar.c
index 76df8202e..098eda7c8 100644
--- a/src/spicelib/devices/asrc/asrcpar.c
+++ b/src/spicelib/devices/asrc/asrcpar.c
@@ -22,7 +22,7 @@ ASRCparam(param,value,fast,select)
     GENinstance *fast;
     IFvalue *select;
 {
-    register ASRCinstance *here = (ASRCinstance*)fast;
+    ASRCinstance *here = (ASRCinstance*)fast;
     switch(param) {
         case ASRC_VOLTAGE:
             here->ASRCtype = ASRC_VOLTAGE;
diff --git a/src/spicelib/devices/asrc/asrcpzld.c b/src/spicelib/devices/asrc/asrcpzld.c
index f9c5b1fec..02af43dee 100644
--- a/src/spicelib/devices/asrc/asrcpzld.c
+++ b/src/spicelib/devices/asrc/asrcpzld.c
@@ -23,8 +23,8 @@ ASRCpzLoad(inModel,ckt,s)
          * sparse matrix previously provided 
          */
 {
-    register ASRCmodel *model = (ASRCmodel*)inModel;
-    register ASRCinstance *here;
+    ASRCmodel *model = (ASRCmodel*)inModel;
+    ASRCinstance *here;
     double value;
     int i, v_first, j, branch;
     int node_num;
diff --git a/src/spicelib/devices/asrc/asrcset.c b/src/spicelib/devices/asrc/asrcset.c
index 10708d3c4..1f2937ea9 100644
--- a/src/spicelib/devices/asrc/asrcset.c
+++ b/src/spicelib/devices/asrc/asrcset.c
@@ -17,17 +17,17 @@ Author: 1987 Kanwar Jit Singh
 /*ARGSUSED*/
 int
 ASRCsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     int *states;
         /* load the voltage source structure with those 
      * pointers needed later for fast matrix loading 
          */
 
 {
-    register ASRCinstance *here;
-    register ASRCmodel *model = (ASRCmodel*)inModel;
+    ASRCinstance *here;
+    ASRCmodel *model = (ASRCmodel*)inModel;
     int error, i, j;
     int v_first;
     CKTnode *tmp;
diff --git a/src/spicelib/devices/bjt/bjtacld.c b/src/spicelib/devices/bjt/bjtacld.c
index 2f1b45b8b..f647e2c28 100644
--- a/src/spicelib/devices/bjt/bjtacld.c
+++ b/src/spicelib/devices/bjt/bjtacld.c
@@ -18,12 +18,12 @@ Author: 1985 Thomas L. Quarles
 
 int
 BJTacLoad(inModel,ckt)
-    register GENmodel *inModel;
+    GENmodel *inModel;
     CKTcircuit *ckt;
 
 {
-    register BJTinstance *here;
-    register BJTmodel *model = (BJTmodel*)inModel;
+    BJTinstance *here;
+    BJTmodel *model = (BJTmodel*)inModel;
     double gcpr;
     double gepr;
     double gpi;
diff --git a/src/spicelib/devices/bjt/bjtconv.c b/src/spicelib/devices/bjt/bjtconv.c
index 17a5ec917..99baeee10 100644
--- a/src/spicelib/devices/bjt/bjtconv.c
+++ b/src/spicelib/devices/bjt/bjtconv.c
@@ -18,11 +18,11 @@ Author: 1985 Thomas L. Quarles
 int
 BJTconvTest(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 
 {
-    register BJTinstance *here;
-    register BJTmodel *model = (BJTmodel *) inModel;
+    BJTinstance *here;
+    BJTmodel *model = (BJTmodel *) inModel;
     double tol;
     double cc;
     double cchat;
diff --git a/src/spicelib/devices/bjt/bjtdisto.c b/src/spicelib/devices/bjt/bjtdisto.c
index 08c993454..7266ba00c 100644
--- a/src/spicelib/devices/bjt/bjtdisto.c
+++ b/src/spicelib/devices/bjt/bjtdisto.c
@@ -17,7 +17,7 @@ Author: 1988 Jaijeet S Roychowdhury
  * the correct value
  */
 int
-BJTdisto(int mode, GENmodel *genmodel, register CKTcircuit *ckt)
+BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 {
     BJTmodel *model = (BJTmodel *) genmodel;
     DISTOAN* job = (DISTOAN*) ckt->CKTcurJob;
@@ -39,7 +39,7 @@ BJTdisto(int mode, GENmodel *genmodel, register CKTcircuit *ckt)
     double r2h1m2y,i2h1m2y;
     double r2h1m2z, i2h1m2z;
     double temp, itemp;
-    register BJTinstance *here;
+    BJTinstance *here;
 #ifdef DISTODEBUG
     double time;
 #endif
diff --git a/src/spicelib/devices/bjt/bjtdset.c b/src/spicelib/devices/bjt/bjtdset.c
index fae419274..62742a6bb 100644
--- a/src/spicelib/devices/bjt/bjtdset.c
+++ b/src/spicelib/devices/bjt/bjtdset.c
@@ -23,8 +23,8 @@ Author: 1988 Jaijeet S Roychowdhury
 int
 BJTdSetup(GENmodel *inModel, CKTcircuit *ckt)
 {
-    register BJTmodel *model = (BJTmodel*)inModel;
-    register BJTinstance *here;
+    BJTmodel *model = (BJTmodel*)inModel;
+    BJTinstance *here;
     double arg;
     double c2;
     double c4;
diff --git a/src/spicelib/devices/bjt/bjtgetic.c b/src/spicelib/devices/bjt/bjtgetic.c
index 45d3cde95..4665a7cd9 100644
--- a/src/spicelib/devices/bjt/bjtgetic.c
+++ b/src/spicelib/devices/bjt/bjtgetic.c
@@ -21,12 +21,12 @@ Author: 1985 Thomas L. Quarles
 int
 BJTgetic(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 
 {
 
     BJTmodel *model = (BJTmodel*)inModel;
-    register BJTinstance *here;
+    BJTinstance *here;
     /*
      * grab initial conditions out of rhs array.   User specified, so use
      * external nodes to get values
diff --git a/src/spicelib/devices/bjt/bjtload.c b/src/spicelib/devices/bjt/bjtload.c
index 3e8d4ef5a..e66d1e9de 100644
--- a/src/spicelib/devices/bjt/bjtload.c
+++ b/src/spicelib/devices/bjt/bjtload.c
@@ -22,13 +22,13 @@ int
 BJTload(inModel,ckt)
 
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current resistance value into the 
          * sparse matrix previously provided 
          */
 {
-    register BJTmodel *model = (BJTmodel*)inModel;
-    register BJTinstance *here;
+    BJTmodel *model = (BJTmodel*)inModel;
+    BJTinstance *here;
     double arg1;
     double arg2;
     double arg3;
@@ -313,7 +313,7 @@ BJTload(inModel,ckt)
                 cbhat= *(ckt->CKTstate0 + here->BJTcb)+ *(ckt->CKTstate0 + 
                         here->BJTgpi)*delvbe+ *(ckt->CKTstate0 + here->BJTgmu)*
                         delvbc;
-#ifndef NOBYPASS
+
                 /*
                  *    bypass if solution has not changed
                  */
@@ -354,7 +354,7 @@ BJTload(inModel,ckt)
                     geqbx = *(ckt->CKTstate0 + here->BJTgeqbx);
                     goto load;
                 }
-#endif /*NOBYPASS*/
+
                 /*
                  *   limit nonlinear branch voltages
                  */
@@ -652,21 +652,6 @@ next1:      vtn=vt*model->BJTemissionCoeffF;
                 if (icheck == 1) {
                     ckt->CKTnoncon++;
 		    ckt->CKTtroubleElt = (GENinstance *) here;
-#ifndef NEWCONV
-                } else {
-                    tol=ckt->CKTreltol*MAX(fabs(cchat),fabs(cc))+ckt->CKTabstol;
-                    if (fabs(cchat-cc) > tol) {
-                        ckt->CKTnoncon++;
-			ckt->CKTtroubleElt = (GENinstance *) here;
-                    } else {
-                        tol=ckt->CKTreltol*MAX(fabs(cbhat),fabs(cb))+
-                            ckt->CKTabstol;
-                        if (fabs(cbhat-cb) > tol) {
-                            ckt->CKTnoncon++;
-			    ckt->CKTtroubleElt = (GENinstance *) here;
-                        }
-                    }
-#endif /* NEWCONV */
                 }
             }
 
diff --git a/src/spicelib/devices/bjt/bjtnoise.c b/src/spicelib/devices/bjt/bjtnoise.c
index fd730e16f..60a11cd6b 100644
--- a/src/spicelib/devices/bjt/bjtnoise.c
+++ b/src/spicelib/devices/bjt/bjtnoise.c
@@ -30,12 +30,12 @@ BJTnoise (mode, operation, genmodel, ckt, data, OnDens)
     int mode;
     int operation;
     CKTcircuit *ckt;
-    register Ndata *data;
+    Ndata *data;
     double *OnDens;
 {
     BJTmodel *firstModel = (BJTmodel *) genmodel;
-    register BJTmodel *model;
-    register BJTinstance *inst;
+    BJTmodel *model;
+    BJTinstance *inst;
     char name[N_MXVLNTH];
     double tempOnoise;
     double tempInoise;
diff --git a/src/spicelib/devices/bjt/bjtparam.c b/src/spicelib/devices/bjt/bjtparam.c
index 742a4e070..8922fca63 100644
--- a/src/spicelib/devices/bjt/bjtparam.c
+++ b/src/spicelib/devices/bjt/bjtparam.c
@@ -27,7 +27,7 @@ BJTparam(param,value,instPtr,select)
     GENinstance *instPtr;
     IFvalue *select;
 {
-    register BJTinstance *here = (BJTinstance*)instPtr;
+    BJTinstance *here = (BJTinstance*)instPtr;
 
     switch(param) {
         case BJT_AREA:
diff --git a/src/spicelib/devices/bjt/bjtpzld.c b/src/spicelib/devices/bjt/bjtpzld.c
index 736817b19..ed1110c06 100644
--- a/src/spicelib/devices/bjt/bjtpzld.c
+++ b/src/spicelib/devices/bjt/bjtpzld.c
@@ -17,12 +17,12 @@ Author: 1985 Thomas L. Quarles
 int
 BJTpzLoad(inModel,ckt,s)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
-    register SPcomplex *s;
+    CKTcircuit *ckt;
+    SPcomplex *s;
 
 {
-    register BJTmodel *model = (BJTmodel*)inModel;
-    register BJTinstance *here;
+    BJTmodel *model = (BJTmodel*)inModel;
+    BJTinstance *here;
     double gcpr;
     double gepr;
     double gpi;
diff --git a/src/spicelib/devices/bjt/bjtsacl.c b/src/spicelib/devices/bjt/bjtsacl.c
index 0932e06d0..4968879e3 100644
--- a/src/spicelib/devices/bjt/bjtsacl.c
+++ b/src/spicelib/devices/bjt/bjtsacl.c
@@ -25,8 +25,8 @@ CKTcircuit *ckt;
 
 {
 
-    register BJTmodel *model = (BJTmodel*)inModel;
-    register BJTinstance *here;
+    BJTmodel *model = (BJTmodel*)inModel;
+    BJTinstance *here;
     double SaveState[25];
     int    error;
     int    flag;
diff --git a/src/spicelib/devices/bjt/bjtsetup.c b/src/spicelib/devices/bjt/bjtsetup.c
index 061abf6f6..064812423 100644
--- a/src/spicelib/devices/bjt/bjtsetup.c
+++ b/src/spicelib/devices/bjt/bjtsetup.c
@@ -22,7 +22,7 @@ Author: 1985 Thomas L. Quarles
 
 int
 BJTsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
     CKTcircuit *ckt;
     int *states;
@@ -31,8 +31,8 @@ BJTsetup(matrix,inModel,ckt,states)
          */
 
 {
-    register BJTmodel *model = (BJTmodel*)inModel;
-    register BJTinstance *here;
+    BJTmodel *model = (BJTmodel*)inModel;
+    BJTinstance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/bjt/bjtsload.c b/src/spicelib/devices/bjt/bjtsload.c
index c3a07ff05..8359b913d 100644
--- a/src/spicelib/devices/bjt/bjtsload.c
+++ b/src/spicelib/devices/bjt/bjtsload.c
@@ -23,8 +23,8 @@ BJTsLoad(inModel,ckt)
 GENmodel *inModel;
 CKTcircuit *ckt;
 {
-    register BJTmodel *model = (BJTmodel*)inModel;
-    register BJTinstance *here;
+    BJTmodel *model = (BJTmodel*)inModel;
+    BJTinstance *here;
     double   SaveState0[27];
     int    i;
     int    iparmno;
diff --git a/src/spicelib/devices/bjt/bjtsprt.c b/src/spicelib/devices/bjt/bjtsprt.c
index fc06c6a44..efdc0a252 100644
--- a/src/spicelib/devices/bjt/bjtsprt.c
+++ b/src/spicelib/devices/bjt/bjtsprt.c
@@ -21,11 +21,11 @@ Author: 1985 Thomas L. Quarles
 void
 BJTsPrint(inModel,ckt)
 
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 GENmodel *inModel;
 {
-    register BJTmodel *model = (BJTmodel*)inModel;
-    register BJTinstance *here;
+    BJTmodel *model = (BJTmodel*)inModel;
+    BJTinstance *here;
 
     printf("BJTS-----------------\n");
     /*  loop through all the BJT models */
diff --git a/src/spicelib/devices/bjt/bjtsset.c b/src/spicelib/devices/bjt/bjtsset.c
index f02ac3497..954a819a4 100644
--- a/src/spicelib/devices/bjt/bjtsset.c
+++ b/src/spicelib/devices/bjt/bjtsset.c
@@ -20,11 +20,11 @@ Author: 1985 Thomas L. Quarles
 
 int
 BJTsSetup(info,inModel)
-    register SENstruct *info;
+    SENstruct *info;
     GENmodel *inModel;
 {
-    register BJTmodel *model = (BJTmodel*)inModel;
-    register BJTinstance *here;
+    BJTmodel *model = (BJTmodel*)inModel;
+    BJTinstance *here;
 
 #ifdef STEPDEBUG
     printf(" BJTsensetup \n");
diff --git a/src/spicelib/devices/bjt/bjtsupd.c b/src/spicelib/devices/bjt/bjtsupd.c
index eb1cb344b..05a4d5141 100644
--- a/src/spicelib/devices/bjt/bjtsupd.c
+++ b/src/spicelib/devices/bjt/bjtsupd.c
@@ -19,10 +19,10 @@ Author: 1985 Thomas L. Quarles
 int
 BJTsUpdate(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register BJTmodel *model = (BJTmodel*)inModel;
-    register BJTinstance *here;
+    BJTmodel *model = (BJTmodel*)inModel;
+    BJTinstance *here;
     int    iparmno;
     double sb;
     double sbprm;
diff --git a/src/spicelib/devices/bjt/bjttemp.c b/src/spicelib/devices/bjt/bjttemp.c
index 5a24553d5..2c117efd1 100644
--- a/src/spicelib/devices/bjt/bjttemp.c
+++ b/src/spicelib/devices/bjt/bjttemp.c
@@ -23,8 +23,8 @@ BJTtemp(inModel,ckt)
          */
 
 {
-    register BJTmodel *model = (BJTmodel *)inModel;
-    register BJTinstance *here;
+    BJTmodel *model = (BJTmodel *)inModel;
+    BJTinstance *here;
     double xfc;
     double vt;
     double ratlog;
diff --git a/src/spicelib/devices/bjt/bjttrunc.c b/src/spicelib/devices/bjt/bjttrunc.c
index 443fbe84b..e27be8fae 100644
--- a/src/spicelib/devices/bjt/bjttrunc.c
+++ b/src/spicelib/devices/bjt/bjttrunc.c
@@ -21,12 +21,12 @@ Author: 1985 Thomas L. Quarles
 int
 BJTtrunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 
 {
-    register BJTmodel *model = (BJTmodel*)inModel;
-    register BJTinstance *here;
+    BJTmodel *model = (BJTmodel*)inModel;
+    BJTinstance *here;
 
     for( ; model != NULL; model = model->BJTnextModel) {
         for(here=model->BJTinstances;here!=NULL;here = here->BJTnextInstance){
diff --git a/src/spicelib/devices/bsim1/b1acld.c b/src/spicelib/devices/bsim1/b1acld.c
index 138b428c1..8ff2919ec 100644
--- a/src/spicelib/devices/bsim1/b1acld.c
+++ b/src/spicelib/devices/bsim1/b1acld.c
@@ -16,10 +16,10 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
 int
 B1acLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register B1model *model = (B1model*)inModel;
-    register B1instance *here;
+    B1model *model = (B1model*)inModel;
+    B1instance *here;
     int xnrm;
     int xrev;
     double gdpr;
diff --git a/src/spicelib/devices/bsim1/b1cvtest.c b/src/spicelib/devices/bsim1/b1cvtest.c
index d46835c60..b6bfd5805 100644
--- a/src/spicelib/devices/bsim1/b1cvtest.c
+++ b/src/spicelib/devices/bsim1/b1cvtest.c
@@ -17,14 +17,14 @@ int
 B1convTest(inModel,ckt)
 
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 
         /* actually load the current value into the 
          * sparse matrix previously provided 
          */
 {
-    register B1model *model = (B1model*)inModel;
-    register B1instance *here;
+    B1model *model = (B1model*)inModel;
+    B1instance *here;
     double cbd;
     double cbhat;
     double cbs;
diff --git a/src/spicelib/devices/bsim1/b1disto.c b/src/spicelib/devices/bsim1/b1disto.c
index de55d1d04..0deaa93be 100644
--- a/src/spicelib/devices/bsim1/b1disto.c
+++ b/src/spicelib/devices/bsim1/b1disto.c
@@ -14,7 +14,7 @@ Author: 1988 Jaijeet S Roychowdhury
 int
 B1disto(mode,genmodel,ckt)
  GENmodel *genmodel;
- register CKTcircuit *ckt;
+ CKTcircuit *ckt;
  int mode;
 
 /* assuming here that ckt->CKTomega has been initialised to 
@@ -40,7 +40,7 @@ B1disto(mode,genmodel,ckt)
  double r2h1m2y,i2h1m2y;
  double r2h1m2z, i2h1m2z;
  double temp, itemp;
- register B1instance *here;
+ B1instance *here;
 
 if (mode == D_SETUP)
  return(B1dSetup(model,ckt));
diff --git a/src/spicelib/devices/bsim1/b1dset.c b/src/spicelib/devices/bsim1/b1dset.c
index e6a410b40..9d664a0a2 100644
--- a/src/spicelib/devices/bsim1/b1dset.c
+++ b/src/spicelib/devices/bsim1/b1dset.c
@@ -18,11 +18,11 @@ int
 B1dSetup(inModel,ckt)
 
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 
 {
-  register B1model* model = (B1model*)inModel;
-  register B1instance *here;
+  B1model* model = (B1model*)inModel;
+  B1instance *here;
   double DrainSatCurrent;
   double EffectiveLength;
   double GateBulkOverlapCap;
diff --git a/src/spicelib/devices/bsim1/b1eval.c b/src/spicelib/devices/bsim1/b1eval.c
index b4779c07d..6caef6dd3 100644
--- a/src/spicelib/devices/bsim1/b1eval.c
+++ b/src/spicelib/devices/bsim1/b1eval.c
@@ -21,9 +21,9 @@ B1evaluate(vds,vbs,vgs,here,model,gmPointer,gdsPointer,gmbsPointer,
         cbgbPointer,cbdbPointer,cbsbPointer,cdgbPointer,cddbPointer,
         cdsbPointer,cdrainPointer,vonPointer,vdsatPointer,ckt)
 
-    register CKTcircuit  *ckt;
-    register B1model   *model;
-    register B1instance *here;
+    CKTcircuit  *ckt;
+    B1model   *model;
+    B1instance *here;
     double vds;
     double vbs;
     double vgs;
diff --git a/src/spicelib/devices/bsim1/b1ld.c b/src/spicelib/devices/bsim1/b1ld.c
index a1cccab01..05a8b38c6 100644
--- a/src/spicelib/devices/bsim1/b1ld.c
+++ b/src/spicelib/devices/bsim1/b1ld.c
@@ -17,14 +17,14 @@ int
 B1load(inModel,ckt)
 
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 
         /* actually load the current value into the 
          * sparse matrix previously provided 
          */
 {
-    register B1model *model = (B1model*)inModel;
-    register B1instance *here;
+    B1model *model = (B1model*)inModel;
+    B1instance *here;
     double DrainSatCurrent = 0.0;
     double EffectiveLength = 0.0;
     double GateBulkOverlapCap = 0.0;
@@ -123,9 +123,7 @@ B1load(inModel,ckt)
     double vt0 = 0.0;
     double args[8];
     int    ByPass = 0;
-#ifndef NOBYPASS
     double tempv = 0.0;
-#endif /*NOBYPASS*/
     int error = 0;
 
 
@@ -280,7 +278,6 @@ B1load(inModel,ckt)
                     *(ckt->CKTstate0 + here->B1gbd) * delvbd +
                     *(ckt->CKTstate0 + here->B1gbs) * delvbs ;
 
-#ifndef NOBYPASS
                     /* now lets see if we can bypass (ugh) */
 
                 /* following should be one big if connected by && all over
@@ -344,7 +341,6 @@ B1load(inModel,ckt)
                         goto line850;
                     }
                 }
-#endif /*NOBYPASS*/
 
                 von = model->B1type * here->B1von;
                 if(*(ckt->CKTstate0 + here->B1vds) >=0) {
@@ -495,21 +491,6 @@ B1load(inModel,ckt)
                 if (Check == 1) {
                     ckt->CKTnoncon++;
 		    ckt->CKTtroubleElt = (GENinstance *) here;
-#ifndef NEWCONV
-                } else {
-                    tol=ckt->CKTreltol*MAX(fabs(cdhat),fabs(cd))+ckt->CKTabstol;
-                    if (fabs(cdhat-cd) >= tol) { 
-                        ckt->CKTnoncon++;
-			ckt->CKTtroubleElt = (GENinstance *) here;
-                    } else {
-                        tol=ckt->CKTreltol*MAX(fabs(cbhat),fabs(cbs+cbd))+
-                            ckt->CKTabstol;
-                        if (fabs(cbhat-(cbs+cbd)) > tol) {
-                            ckt->CKTnoncon++;
-			    ckt->CKTtroubleElt = (GENinstance *) here;
-                        }
-                    }
-#endif /* NEWCONV */
                 }
             }
             *(ckt->CKTstate0 + here->B1vbs) = vbs;
diff --git a/src/spicelib/devices/bsim1/b1moscap.c b/src/spicelib/devices/bsim1/b1moscap.c
index dd69fc20c..ad1d96b41 100644
--- a/src/spicelib/devices/bsim1/b1moscap.c
+++ b/src/spicelib/devices/bsim1/b1moscap.c
@@ -26,7 +26,7 @@ B1mosCap(ckt,vgd,vgs,vgb,
         gcbsbPointer,gcdgbPointer,gcddbPointer,gcdsbPointer,
         gcsgbPointer,gcsdbPointer,gcssbPointer,qGatePointer,qBulkPointer,
         qDrainPointer,qSourcePointer)
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double vgd;
     double vgs;
     double vgb;
diff --git a/src/spicelib/devices/bsim1/b1pzld.c b/src/spicelib/devices/bsim1/b1pzld.c
index d1c47f8e3..3df57b7cd 100644
--- a/src/spicelib/devices/bsim1/b1pzld.c
+++ b/src/spicelib/devices/bsim1/b1pzld.c
@@ -17,11 +17,11 @@ Author: 1985 Thomas L. Quarles
 int
 B1pzLoad(inModel,ckt,s)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
-    register SPcomplex *s;
+    CKTcircuit *ckt;
+    SPcomplex *s;
 {
-    register B1model *model = (B1model*)inModel;
-    register B1instance *here;
+    B1model *model = (B1model*)inModel;
+    B1instance *here;
     int xnrm;
     int xrev;
     double gdpr;
diff --git a/src/spicelib/devices/bsim1/b1set.c b/src/spicelib/devices/bsim1/b1set.c
index 4e4cc6210..92deaf599 100644
--- a/src/spicelib/devices/bsim1/b1set.c
+++ b/src/spicelib/devices/bsim1/b1set.c
@@ -14,17 +14,17 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
 
 int
 B1setup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
-    register GENmodel *inModel;
-    register CKTcircuit *ckt;
+    SMPmatrix *matrix;
+    GENmodel *inModel;
+    CKTcircuit *ckt;
     int *states;
         /* load the B1 device structure with those pointers needed later 
          * for fast matrix loading 
          */
 
 {
-    register B1model *model = (B1model*)inModel;
-    register B1instance *here;
+    B1model *model = (B1model*)inModel;
+    B1instance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/bsim1/b1temp.c b/src/spicelib/devices/bsim1/b1temp.c
index 1d3d74be2..a399e0da8 100644
--- a/src/spicelib/devices/bsim1/b1temp.c
+++ b/src/spicelib/devices/bsim1/b1temp.c
@@ -22,8 +22,8 @@ B1temp(inModel,ckt)
          */
 
 {
-    register B1model *model = (B1model*) inModel;
-    register B1instance *here;
+    B1model *model = (B1model*) inModel;
+    B1instance *here;
     double  EffChanLength;
     double EffChanWidth;
     double Cox;
diff --git a/src/spicelib/devices/bsim1/b1trunc.c b/src/spicelib/devices/bsim1/b1trunc.c
index f67b63701..240005a32 100644
--- a/src/spicelib/devices/bsim1/b1trunc.c
+++ b/src/spicelib/devices/bsim1/b1trunc.c
@@ -13,12 +13,12 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
 int
 B1trunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 
 {
-    register B1model *model = (B1model*)inModel;
-    register B1instance *here;
+    B1model *model = (B1model*)inModel;
+    B1instance *here;
 #ifdef STEPDEBUG
     double debugtemp;
 #endif /* STEPDEBUG */
diff --git a/src/spicelib/devices/bsim2/b2acld.c b/src/spicelib/devices/bsim2/b2acld.c
index 5ba9bc679..854810134 100644
--- a/src/spicelib/devices/bsim2/b2acld.c
+++ b/src/spicelib/devices/bsim2/b2acld.c
@@ -16,10 +16,10 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
 int
 B2acLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register B2model *model = (B2model*)inModel;
-    register B2instance *here;
+    B2model *model = (B2model*)inModel;
+    B2instance *here;
     int xnrm;
     int xrev;
     double gdpr;
diff --git a/src/spicelib/devices/bsim2/b2cvtest.c b/src/spicelib/devices/bsim2/b2cvtest.c
index 81c561b7e..87a7e1959 100644
--- a/src/spicelib/devices/bsim2/b2cvtest.c
+++ b/src/spicelib/devices/bsim2/b2cvtest.c
@@ -17,14 +17,14 @@ int
 B2convTest(inModel,ckt)
 
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 
         /* actually load the current value into the 
          * sparse matrix previously provided 
          */
 {
-    register B2model *model = (B2model*)inModel;
-    register B2instance *here;
+    B2model *model = (B2model*)inModel;
+    B2instance *here;
     double cbd;
     double cbhat;
     double cbs;
diff --git a/src/spicelib/devices/bsim2/b2eval.c b/src/spicelib/devices/bsim2/b2eval.c
index 5b8963896..9b34e144e 100644
--- a/src/spicelib/devices/bsim2/b2eval.c
+++ b/src/spicelib/devices/bsim2/b2eval.c
@@ -19,9 +19,9 @@ void
 B2evaluate(Vds,Vbs,Vgs,here,model,gm,gds,gmb,qg,qb,qd,cgg,cgd,cgs,
         cbg,cbd,cbs,cdg,cdd,cds,Ids,von,vdsat,ckt)
 
-    register CKTcircuit  *ckt;
-    register B2model   *model;
-    register B2instance *here;
+    CKTcircuit  *ckt;
+    B2model   *model;
+    B2instance *here;
     double Vds,Vbs,Vgs;
     double *gm,*gds,*gmb,*qg,*qb,*qd,*cgg,*cgd,*cgs,*cbg;
     double *cbd,*cbs,*cdg,*cdd,*cds,*Ids,*von,*vdsat;
diff --git a/src/spicelib/devices/bsim2/b2ld.c b/src/spicelib/devices/bsim2/b2ld.c
index ed6f3c885..ad5f2888c 100644
--- a/src/spicelib/devices/bsim2/b2ld.c
+++ b/src/spicelib/devices/bsim2/b2ld.c
@@ -17,14 +17,14 @@ int
 B2load(inModel,ckt)
 
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 
         /* actually load the current value into the 
          * sparse matrix previously provided 
          */
 {
-    register B2model *model = (B2model*)inModel;
-    register B2instance *here;
+    B2model *model = (B2model*)inModel;
+    B2instance *here;
     double DrainSatCurrent;
     double EffectiveLength;
     double GateBulkOverlapCap;
@@ -123,9 +123,7 @@ B2load(inModel,ckt)
     double vt0;
     double args[7];
     int    ByPass;
-#ifndef NOBYPASS
     double tempv;
-#endif /*NOBYPASS*/
     int error;
 
 
@@ -280,7 +278,6 @@ B2load(inModel,ckt)
                     *(ckt->CKTstate0 + here->B2gbd) * delvbd +
                     *(ckt->CKTstate0 + here->B2gbs) * delvbs ;
 
-#ifndef NOBYPASS
                     /* now lets see if we can bypass (ugh) */
 
                 /* following should be one big if connected by && all over
@@ -344,7 +341,6 @@ B2load(inModel,ckt)
                         goto line850;
                     }
                 }
-#endif /*NOBYPASS*/
 
                 von = model->B2type * here->B2von;
                 if(*(ckt->CKTstate0 + here->B2vds) >=0) {
@@ -496,21 +492,6 @@ B2load(inModel,ckt)
                 if (Check == 1) {
                     ckt->CKTnoncon++;
 		    ckt->CKTtroubleElt = (GENinstance *) here;
-#ifndef NEWCONV
-                } else {
-                    tol=ckt->CKTreltol*MAX(fabs(cdhat),fabs(cd))+ckt->CKTabstol;
-                    if (fabs(cdhat-cd) >= tol) { 
-                        ckt->CKTnoncon++;
-			ckt->CKTtroubleElt = (GENinstance *) here;
-                    } else {
-                        tol=ckt->CKTreltol*MAX(fabs(cbhat),fabs(cbs+cbd))+
-                            ckt->CKTabstol;
-                        if (fabs(cbhat-(cbs+cbd)) > tol) {
-                            ckt->CKTnoncon++;
-			    ckt->CKTtroubleElt = (GENinstance *) here;
-                        }
-                    }
-#endif /* NEWCONV */
                 }
             }
             *(ckt->CKTstate0 + here->B2vbs) = vbs;
diff --git a/src/spicelib/devices/bsim2/b2moscap.c b/src/spicelib/devices/bsim2/b2moscap.c
index 0071bbfb0..5d84424d5 100644
--- a/src/spicelib/devices/bsim2/b2moscap.c
+++ b/src/spicelib/devices/bsim2/b2moscap.c
@@ -26,7 +26,7 @@ B2mosCap(ckt,vgd,vgs,vgb,
         gcbsbPointer,gcdgbPointer,gcddbPointer,gcdsbPointer,
         gcsgbPointer,gcsdbPointer,gcssbPointer,qGatePointer,qBulkPointer,
         qDrainPointer,qSourcePointer)
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double vgd;
     double vgs;
     double vgb;
diff --git a/src/spicelib/devices/bsim2/b2pzld.c b/src/spicelib/devices/bsim2/b2pzld.c
index aa4bb91ce..d9f4bbfb9 100644
--- a/src/spicelib/devices/bsim2/b2pzld.c
+++ b/src/spicelib/devices/bsim2/b2pzld.c
@@ -17,11 +17,11 @@ Author: 1985 Thomas L. Quarles
 int
 B2pzLoad(inModel,ckt,s)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
-    register SPcomplex *s;
+    CKTcircuit *ckt;
+    SPcomplex *s;
 {
-    register B2model *model = (B2model*)inModel;
-    register B2instance *here;
+    B2model *model = (B2model*)inModel;
+    B2instance *here;
     int xnrm;
     int xrev;
     double gdpr;
diff --git a/src/spicelib/devices/bsim2/b2set.c b/src/spicelib/devices/bsim2/b2set.c
index 6722afcb4..5b8c295d5 100644
--- a/src/spicelib/devices/bsim2/b2set.c
+++ b/src/spicelib/devices/bsim2/b2set.c
@@ -14,17 +14,17 @@ Author: 1988 Min-Chie Jeng, Hong J. Park, Thomas L. Quarles
 
 int
 B2setup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
-    register GENmodel *inModel;
-    register CKTcircuit *ckt;
+    SMPmatrix *matrix;
+    GENmodel *inModel;
+    CKTcircuit *ckt;
     int *states;
         /* load the B2 device structure with those pointers needed later 
          * for fast matrix loading 
          */
 
 {
-    register B2model *model = (B2model*)inModel;
-    register B2instance *here;
+    B2model *model = (B2model*)inModel;
+    B2instance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/bsim2/b2temp.c b/src/spicelib/devices/bsim2/b2temp.c
index 6a20742e2..75be23b16 100644
--- a/src/spicelib/devices/bsim2/b2temp.c
+++ b/src/spicelib/devices/bsim2/b2temp.c
@@ -22,9 +22,9 @@ B2temp(inModel,ckt)
          */
 
 {
-    register B2model *model = (B2model*) inModel;
-    register B2instance *here;
-    register struct bsim2SizeDependParam *pSizeDependParamKnot, *pLastKnot;
+    B2model *model = (B2model*) inModel;
+    B2instance *here;
+    struct bsim2SizeDependParam *pSizeDependParamKnot, *pLastKnot;
     double  EffectiveLength;
     double EffectiveWidth;
     double CoxWoverL, Inv_L, Inv_W, tmp;
diff --git a/src/spicelib/devices/bsim2/b2trunc.c b/src/spicelib/devices/bsim2/b2trunc.c
index e61d4b8cc..11d2f9d19 100644
--- a/src/spicelib/devices/bsim2/b2trunc.c
+++ b/src/spicelib/devices/bsim2/b2trunc.c
@@ -13,12 +13,12 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
 int
 B2trunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 
 {
-    register B2model *model = (B2model*)inModel;
-    register B2instance *here;
+    B2model *model = (B2model*)inModel;
+    B2instance *here;
 #ifdef STEPDEBUG
     double debugtemp;
 #endif /* STEPDEBUG */
diff --git a/src/spicelib/devices/bsim3/b3acld.c b/src/spicelib/devices/bsim3/b3acld.c
index 6494f0332..ac9591cee 100644
--- a/src/spicelib/devices/bsim3/b3acld.c
+++ b/src/spicelib/devices/bsim3/b3acld.c
@@ -16,10 +16,10 @@ File: b3acld.c
 int
 BSIM3acLoad(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM3model *model = (BSIM3model*)inModel;
-register BSIM3instance *here;
+BSIM3model *model = (BSIM3model*)inModel;
+BSIM3instance *here;
 double xcggb, xcgdb, xcgsb, xcbgb, xcbdb, xcbsb, xcddb, xcssb, xcdgb;
 double gdpr, gspr, gds, gbd, gbs, capbd, capbs, xcsgb, xcdsb, xcsdb;
 double cggb, cgdb, cgsb, cbgb, cbdb, cbsb, cddb, cdgb, cdsb, omega;
diff --git a/src/spicelib/devices/bsim3/b3check.c b/src/spicelib/devices/bsim3/b3check.c
index cfa52f5dd..5275c823d 100644
--- a/src/spicelib/devices/bsim3/b3check.c
+++ b/src/spicelib/devices/bsim3/b3check.c
@@ -18,8 +18,8 @@ File: b3check.c
 
 int
 BSIM3checkModel(model, here, ckt)
-register BSIM3model *model;
-register BSIM3instance *here;
+BSIM3model *model;
+BSIM3instance *here;
 CKTcircuit *ckt;
 {
 struct bsim3SizeDependParam *pParam;
diff --git a/src/spicelib/devices/bsim3/b3cvtest.c b/src/spicelib/devices/bsim3/b3cvtest.c
index 6616de4d6..efc11d12b 100644
--- a/src/spicelib/devices/bsim3/b3cvtest.c
+++ b/src/spicelib/devices/bsim3/b3cvtest.c
@@ -20,10 +20,10 @@ File: b3cvtest.c
 int
 BSIM3convTest(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM3model *model = (BSIM3model*)inModel;
-register BSIM3instance *here;
+BSIM3model *model = (BSIM3model*)inModel;
+BSIM3instance *here;
 double delvbd, delvbs, delvds, delvgd, delvgs, vbd, vbs, vds;
 double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs;
 
diff --git a/src/spicelib/devices/bsim3/b3ld.c b/src/spicelib/devices/bsim3/b3ld.c
index 3a1b6cb89..1ea076330 100644
--- a/src/spicelib/devices/bsim3/b3ld.c
+++ b/src/spicelib/devices/bsim3/b3ld.c
@@ -32,10 +32,10 @@ File: b3ld.c
 int
 BSIM3load(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM3model *model = (BSIM3model*)inModel;
-register BSIM3instance *here;
+BSIM3model *model = (BSIM3model*)inModel;
+BSIM3instance *here;
 double SourceSatCurrent, DrainSatCurrent;
 double ag0, qgd, qgs, qgb, von, cbhat, VgstNVt, ExpVgst;
 double cdrain, cdhat, cdreq, ceqbd, ceqbs, ceqqb, ceqqd, ceqqg, ceq, geq;
@@ -242,7 +242,6 @@ for (; model != NULL; model = model->BSIM3nextModel)
                          + here->BSIM3gbds * delvds;
                }
 
-#ifndef NOBYPASS
            /* following should be one big if connected by && all over
             * the place, but some C compilers can't handle that, so
             * we split it up here to let them digest it in stages
@@ -287,7 +286,6 @@ for (; model != NULL; model = model->BSIM3nextModel)
                    }
                }
 
-#endif /*NOBYPASS*/
                von = here->BSIM3von;
                if (*(ckt->CKTstate0 + here->BSIM3vds) >= 0.0)
 	       {   vgs = DEVfetlim(vgs, *(ckt->CKTstate0+here->BSIM3vgs), von);
@@ -2296,29 +2294,6 @@ finished:
           if ((here->BSIM3off == 0) || (!(ckt->CKTmode & MODEINITFIX)))
 	  {   if (Check == 1)
 	      {   ckt->CKTnoncon++;
-#ifndef NEWCONV
-              } 
-	      else
-              {   if (here->BSIM3mode >= 0)
-                  {   Idtot = here->BSIM3cd + here->BSIM3csub - here->BSIM3cbd;
-                  }
-                  else
-                  {   Idtot = here->BSIM3cd - here->BSIM3cbd;
-                  }
-                  tol = ckt->CKTreltol * MAX(fabs(cdhat), fabs(Idtot))
-                      + ckt->CKTabstol;
-                  if (fabs(cdhat - Idtot) >= tol)
-                  {   ckt->CKTnoncon++;
-                  }
-                  else
-                  {   Ibtot = here->BSIM3cbs + here->BSIM3cbd - here->BSIM3csub;
-                      tol = ckt->CKTreltol * MAX(fabs(cbhat), fabs(Ibtot))
-                          + ckt->CKTabstol;
-                      if (fabs(cbhat - Ibtot)) > tol)
-		      {   ckt->CKTnoncon++;
-                      }
-                  }
-#endif /* NEWCONV */
               }
           }
           *(ckt->CKTstate0 + here->BSIM3vbs) = vbs;
diff --git a/src/spicelib/devices/bsim3/b3noi.c b/src/spicelib/devices/bsim3/b3noi.c
index fc129ee93..425dfc6dc 100644
--- a/src/spicelib/devices/bsim3/b3noi.c
+++ b/src/spicelib/devices/bsim3/b3noi.c
@@ -97,11 +97,11 @@ BSIM3noise (mode, operation, inModel, ckt, data, OnDens)
 int mode, operation;
 GENmodel *inModel;
 CKTcircuit *ckt;
-register Ndata *data;
+Ndata *data;
 double *OnDens;
 {
-register BSIM3model *model = (BSIM3model *)inModel;
-register BSIM3instance *here;
+BSIM3model *model = (BSIM3model *)inModel;
+BSIM3instance *here;
 struct bsim3SizeDependParam *pParam;
 char name[N_MXVLNTH];
 double tempOnoise;
diff --git a/src/spicelib/devices/bsim3/b3pzld.c b/src/spicelib/devices/bsim3/b3pzld.c
index 6237d37aa..18247e726 100644
--- a/src/spicelib/devices/bsim3/b3pzld.c
+++ b/src/spicelib/devices/bsim3/b3pzld.c
@@ -16,11 +16,11 @@ File: b3pzld.c
 int
 BSIM3pzLoad(inModel,ckt,s)
 GENmodel *inModel;
-register CKTcircuit *ckt;
-register SPcomplex *s;
+CKTcircuit *ckt;
+SPcomplex *s;
 {
-register BSIM3model *model = (BSIM3model*)inModel;
-register BSIM3instance *here;
+BSIM3model *model = (BSIM3model*)inModel;
+BSIM3instance *here;
 double xcggb, xcgdb, xcgsb, xcgbb, xcbgb, xcbdb, xcbsb, xcbbb;
 double xcdgb, xcddb, xcdsb, xcdbb, xcsgb, xcsdb, xcssb, xcsbb;
 double gdpr, gspr, gds, gbd, gbs, capbd, capbs, FwdSum, RevSum, Gm, Gmbs;
diff --git a/src/spicelib/devices/bsim3/b3set.c b/src/spicelib/devices/bsim3/b3set.c
index c6ad54587..0bd3ded36 100644
--- a/src/spicelib/devices/bsim3/b3set.c
+++ b/src/spicelib/devices/bsim3/b3set.c
@@ -26,13 +26,13 @@ File: b3set.c
 
 int
 BSIM3setup(matrix,inModel,ckt,states)
-register SMPmatrix *matrix;
-register GENmodel *inModel;
-register CKTcircuit *ckt;
+SMPmatrix *matrix;
+GENmodel *inModel;
+CKTcircuit *ckt;
 int *states;
 {
-register BSIM3model *model = (BSIM3model*)inModel;
-register BSIM3instance *here;
+BSIM3model *model = (BSIM3model*)inModel;
+BSIM3instance *here;
 int error;
 CKTnode *tmp;
 
diff --git a/src/spicelib/devices/bsim3/b3temp.c b/src/spicelib/devices/bsim3/b3temp.c
index 601008f5f..4f3c30350 100644
--- a/src/spicelib/devices/bsim3/b3temp.c
+++ b/src/spicelib/devices/bsim3/b3temp.c
@@ -33,8 +33,8 @@ BSIM3temp(inModel,ckt)
 GENmodel *inModel;
 CKTcircuit *ckt;
 {
-register BSIM3model *model = (BSIM3model*) inModel;
-register BSIM3instance *here;
+BSIM3model *model = (BSIM3model*) inModel;
+BSIM3instance *here;
 struct bsim3SizeDependParam *pSizeDependParamKnot, *pLastKnot, *pParam;
 double tmp, tmp1, tmp2, tmp3, Eg, Eg0, ni, T0, T1, T2, T3, T4, T5, Ldrn, Wdrn;
 double delTemp, Temp, TRatio, Inv_L, Inv_W, Inv_LW, Vtm0, Tnom;
diff --git a/src/spicelib/devices/bsim3/b3trunc.c b/src/spicelib/devices/bsim3/b3trunc.c
index fca06be32..e856cdc84 100644
--- a/src/spicelib/devices/bsim3/b3trunc.c
+++ b/src/spicelib/devices/bsim3/b3trunc.c
@@ -17,11 +17,11 @@ File: b3trunc.c
 int
 BSIM3trunc(inModel,ckt,timeStep)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 double *timeStep;
 {
-register BSIM3model *model = (BSIM3model*)inModel;
-register BSIM3instance *here;
+BSIM3model *model = (BSIM3model*)inModel;
+BSIM3instance *here;
 
 #ifdef STEPDEBUG
     double debugtemp;
diff --git a/src/spicelib/devices/bsim3v1/b3v1acld.c b/src/spicelib/devices/bsim3v1/b3v1acld.c
index da5c36371..cd3c67571 100644
--- a/src/spicelib/devices/bsim3v1/b3v1acld.c
+++ b/src/spicelib/devices/bsim3v1/b3v1acld.c
@@ -15,10 +15,10 @@ File: b3v1acld.c
 int
 BSIM3V1acLoad(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM3V1model *model = (BSIM3V1model*)inModel;
-register BSIM3V1instance *here;
+BSIM3V1model *model = (BSIM3V1model*)inModel;
+BSIM3V1instance *here;
 double xcggb, xcgdb, xcgsb, xcbgb, xcbdb, xcbsb, xcddb, xcssb, xcdgb;
 double gdpr, gspr, gds, gbd, gbs, capbd, capbs, xcsgb, xcdsb, xcsdb;
 double cggb, cgdb, cgsb, cbgb, cbdb, cbsb, cddb, cdgb, cdsb, omega;
diff --git a/src/spicelib/devices/bsim3v1/b3v1check.c b/src/spicelib/devices/bsim3v1/b3v1check.c
index fbb68add4..16d58dfce 100644
--- a/src/spicelib/devices/bsim3v1/b3v1check.c
+++ b/src/spicelib/devices/bsim3v1/b3v1check.c
@@ -17,8 +17,8 @@ File: b3v1check.c
 
 int
 BSIM3V1checkModel(model, here, ckt)
-register BSIM3V1model *model;
-register BSIM3V1instance *here;
+BSIM3V1model *model;
+BSIM3V1instance *here;
 CKTcircuit *ckt;
 {
 struct bsim3v1SizeDependParam *pParam;
diff --git a/src/spicelib/devices/bsim3v1/b3v1cvtest.c b/src/spicelib/devices/bsim3v1/b3v1cvtest.c
index 7ee59703e..33e900bd9 100644
--- a/src/spicelib/devices/bsim3v1/b3v1cvtest.c
+++ b/src/spicelib/devices/bsim3v1/b3v1cvtest.c
@@ -19,10 +19,10 @@ File: b3v1cvtest.c
 int
 BSIM3V1convTest(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM3V1model *model = (BSIM3V1model*)inModel;
-register BSIM3V1instance *here;
+BSIM3V1model *model = (BSIM3V1model*)inModel;
+BSIM3V1instance *here;
 double delvbd, delvbs, delvds, delvgd, delvgs, vbd, vbs, vds;
 double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs;
 
diff --git a/src/spicelib/devices/bsim3v1/b3v1ld.c b/src/spicelib/devices/bsim3v1/b3v1ld.c
index 2761b8f69..bf98c291c 100644
--- a/src/spicelib/devices/bsim3v1/b3v1ld.c
+++ b/src/spicelib/devices/bsim3v1/b3v1ld.c
@@ -31,10 +31,10 @@ Modified by Mansun Chan  (1995)
 int
 BSIM3V1load(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM3V1model *model = (BSIM3V1model*)inModel;
-register BSIM3V1instance *here;
+BSIM3V1model *model = (BSIM3V1model*)inModel;
+BSIM3V1instance *here;
 double SourceSatCurrent, DrainSatCurrent;
 double ag0, qgd, qgs, qgb, von, cbhat, VgstNVt, ExpVgst;
 double cdrain, cdhat, cdreq, ceqbd, ceqbs, ceqqb, ceqqd, ceqqg, ceq, geq;
@@ -225,7 +225,6 @@ for (; model != NULL; model = model->BSIM3V1nextModel)
                cbhat = here->BSIM3V1cbs + here->BSIM3V1cbd + here->BSIM3V1gbd
                      * delvbd + here->BSIM3V1gbs * delvbs;
 
-#ifndef NOBYPASS
            /* following should be one big if connected by && all over
             * the place, but some C compilers can't handle that, so
             * we split it up here to let them digest it in stages
@@ -270,7 +269,6 @@ for (; model != NULL; model = model->BSIM3V1nextModel)
                    }
                }
 
-#endif /*NOBYPASS*/
                von = here->BSIM3V1von;
                if (*(ckt->CKTstate0 + here->BSIM3V1vds) >= 0.0)
 	       {   vgs = DEVfetlim(vgs, *(ckt->CKTstate0+here->BSIM3V1vgs), von);
@@ -2028,24 +2026,6 @@ finished: /* returning Values to Calling Routine */
           if ((here->BSIM3V1off == 0) || (!(ckt->CKTmode & MODEINITFIX)))
 	  {   if (Check == 1)
 	      {   ckt->CKTnoncon++;
-#ifndef NEWCONV
-              } 
-	      else
-	      {   tol = ckt->CKTreltol * MAX(fabs(cdhat), fabs(here->BSIM3V1cd))
-		      + ckt->CKTabstol;
-                  if (fabs(cdhat - here->BSIM3V1cd) >= tol)
-		  {   ckt->CKTnoncon++;
-                  }
-		  else
-		  {   tol = ckt->CKTreltol * MAX(fabs(cbhat), 
-			    fabs(here->BSIM3V1cbs + here->BSIM3V1cbd)) 
-			    + ckt->CKTabstol;
-                      if (fabs(cbhat - (here->BSIM3V1cbs + here->BSIM3V1cbd)) 
-			  > tol)
-		      {   ckt->CKTnoncon++;
-                      }
-                  }
-#endif /* NEWCONV */
               }
           }
           *(ckt->CKTstate0 + here->BSIM3V1vbs) = vbs;
diff --git a/src/spicelib/devices/bsim3v1/b3v1noi.c b/src/spicelib/devices/bsim3v1/b3v1noi.c
index 145940e67..3d8974308 100644
--- a/src/spicelib/devices/bsim3v1/b3v1noi.c
+++ b/src/spicelib/devices/bsim3v1/b3v1noi.c
@@ -97,11 +97,11 @@ BSIM3V1noise (mode, operation, inModel, ckt, data, OnDens)
 int mode, operation;
 GENmodel *inModel;
 CKTcircuit *ckt;
-register Ndata *data;
+Ndata *data;
 double *OnDens;
 {
-register BSIM3V1model *model = (BSIM3V1model *)inModel;
-register BSIM3V1instance *here;
+BSIM3V1model *model = (BSIM3V1model *)inModel;
+BSIM3V1instance *here;
 struct bsim3v1SizeDependParam *pParam;
 char name[N_MXVLNTH];
 double tempOnoise;
diff --git a/src/spicelib/devices/bsim3v1/b3v1pzld.c b/src/spicelib/devices/bsim3v1/b3v1pzld.c
index 1c6d58879..fbf2fbf14 100644
--- a/src/spicelib/devices/bsim3v1/b3v1pzld.c
+++ b/src/spicelib/devices/bsim3v1/b3v1pzld.c
@@ -15,11 +15,11 @@ File: b3v1pzld.c
 int
 BSIM3V1pzLoad(inModel,ckt,s)
 GENmodel *inModel;
-register CKTcircuit *ckt;
-register SPcomplex *s;
+CKTcircuit *ckt;
+SPcomplex *s;
 {
-register BSIM3V1model *model = (BSIM3V1model*)inModel;
-register BSIM3V1instance *here;
+BSIM3V1model *model = (BSIM3V1model*)inModel;
+BSIM3V1instance *here;
 double xcggb, xcgdb, xcgsb, xcbgb, xcbdb, xcbsb, xcddb, xcssb, xcdgb;
 double gdpr, gspr, gds, gbd, gbs, capbd, capbs, xcsgb, xcdsb, xcsdb;
 double cggb, cgdb, cgsb, cbgb, cbdb, cbsb, cddb, cdgb, cdsb;
diff --git a/src/spicelib/devices/bsim3v1/b3v1set.c b/src/spicelib/devices/bsim3v1/b3v1set.c
index d2a509851..eb54c5c10 100644
--- a/src/spicelib/devices/bsim3v1/b3v1set.c
+++ b/src/spicelib/devices/bsim3v1/b3v1set.c
@@ -26,13 +26,13 @@ File: b3v1set.c
 
 int
 BSIM3V1setup(matrix,inModel,ckt,states)
-register SMPmatrix *matrix;
-register GENmodel *inModel;
-register CKTcircuit *ckt;
+SMPmatrix *matrix;
+GENmodel *inModel;
+CKTcircuit *ckt;
 int *states;
 {
-register BSIM3V1model *model = (BSIM3V1model*)inModel;
-register BSIM3V1instance *here;
+BSIM3V1model *model = (BSIM3V1model*)inModel;
+BSIM3V1instance *here;
 int error;
 CKTnode *tmp;
 
diff --git a/src/spicelib/devices/bsim3v1/b3v1temp.c b/src/spicelib/devices/bsim3v1/b3v1temp.c
index 3f5d1fdc6..c0054c0d8 100644
--- a/src/spicelib/devices/bsim3v1/b3v1temp.c
+++ b/src/spicelib/devices/bsim3v1/b3v1temp.c
@@ -32,8 +32,8 @@ BSIM3V1temp(inModel,ckt)
 GENmodel *inModel;
 CKTcircuit *ckt;
 {
-register BSIM3V1model *model = (BSIM3V1model*) inModel;
-register BSIM3V1instance *here;
+BSIM3V1model *model = (BSIM3V1model*) inModel;
+BSIM3V1instance *here;
 struct bsim3v1SizeDependParam *pSizeDependParamKnot, *pLastKnot, *pParam;
 double tmp1, tmp2, Eg, Eg0, ni, T0, T1, T2, T3, Ldrn, Wdrn;
 double Temp, TRatio, Inv_L, Inv_W, Inv_LW, Vtm0, Tnom;
diff --git a/src/spicelib/devices/bsim3v1/b3v1trunc.c b/src/spicelib/devices/bsim3v1/b3v1trunc.c
index 9525782e2..fa3e351c4 100644
--- a/src/spicelib/devices/bsim3v1/b3v1trunc.c
+++ b/src/spicelib/devices/bsim3v1/b3v1trunc.c
@@ -16,11 +16,11 @@ File: b3v1trunc.c
 int
 BSIM3V1trunc(inModel,ckt,timeStep)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 double *timeStep;
 {
-register BSIM3V1model *model = (BSIM3V1model*)inModel;
-register BSIM3V1instance *here;
+BSIM3V1model *model = (BSIM3V1model*)inModel;
+BSIM3V1instance *here;
 
 #ifdef STEPDEBUG
     double debugtemp;
diff --git a/src/spicelib/devices/bsim3v2/b3v2acld.c b/src/spicelib/devices/bsim3v2/b3v2acld.c
index 42ed75ce2..160ef7b4a 100644
--- a/src/spicelib/devices/bsim3v2/b3v2acld.c
+++ b/src/spicelib/devices/bsim3v2/b3v2acld.c
@@ -16,10 +16,10 @@ File: b3acld.c
 int
 BSIM3V2acLoad(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM3V2model *model = (BSIM3V2model*)inModel;
-register BSIM3V2instance *here;
+BSIM3V2model *model = (BSIM3V2model*)inModel;
+BSIM3V2instance *here;
 double xcggb, xcgdb, xcgsb, xcbgb, xcbdb, xcbsb, xcddb, xcssb, xcdgb;
 double gdpr, gspr, gds, gbd, gbs, capbd, capbs, xcsgb, xcdsb, xcsdb;
 double cggb, cgdb, cgsb, cbgb, cbdb, cbsb, cddb, cdgb, cdsb, omega;
diff --git a/src/spicelib/devices/bsim3v2/b3v2check.c b/src/spicelib/devices/bsim3v2/b3v2check.c
index 89f8767c0..14056d79a 100644
--- a/src/spicelib/devices/bsim3v2/b3v2check.c
+++ b/src/spicelib/devices/bsim3v2/b3v2check.c
@@ -18,8 +18,8 @@ File: b3v2check.c
 
 int
 BSIM3V2checkModel(model, here, ckt)
-register BSIM3V2model *model;
-register BSIM3V2instance *here;
+BSIM3V2model *model;
+BSIM3V2instance *here;
 CKTcircuit *ckt;
 {
 struct BSIM3V2SizeDependParam *pParam;
diff --git a/src/spicelib/devices/bsim3v2/b3v2cvtest.c b/src/spicelib/devices/bsim3v2/b3v2cvtest.c
index a95822282..b6e8e105b 100644
--- a/src/spicelib/devices/bsim3v2/b3v2cvtest.c
+++ b/src/spicelib/devices/bsim3v2/b3v2cvtest.c
@@ -19,10 +19,10 @@ File: b3v2cvtest.c
 int
 BSIM3V2convTest(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM3V2model *model = (BSIM3V2model*)inModel;
-register BSIM3V2instance *here;
+BSIM3V2model *model = (BSIM3V2model*)inModel;
+BSIM3V2instance *here;
 double delvbd, delvbs, delvds, delvgd, delvgs, vbd, vbs, vds;
 double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs;
 
diff --git a/src/spicelib/devices/bsim3v2/b3v2ld.c b/src/spicelib/devices/bsim3v2/b3v2ld.c
index d3e4b5bba..7d3e0f727 100644
--- a/src/spicelib/devices/bsim3v2/b3v2ld.c
+++ b/src/spicelib/devices/bsim3v2/b3v2ld.c
@@ -32,10 +32,10 @@ File: b3ld.c          1/3/92
 int
 BSIM3V2load(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM3V2model *model = (BSIM3V2model*)inModel;
-register BSIM3V2instance *here;
+BSIM3V2model *model = (BSIM3V2model*)inModel;
+BSIM3V2instance *here;
 double SourceSatCurrent, DrainSatCurrent;
 double ag0, qgd, qgs, qgb, von, cbhat, VgstNVt, ExpVgst;
 double cdrain, cdhat, cdreq, ceqbd, ceqbs, ceqqb, ceqqd, ceqqg, ceq, geq;
@@ -247,7 +247,6 @@ for (; model != NULL; model = model->BSIM3V2nextModel)
                          + here->BSIM3V2gbds * delvds;
                }
 
-#ifndef NOBYPASS
            /* following should be one big if connected by && all over
             * the place, but some C compilers can't handle that, so
             * we split it up here to let them digest it in stages
@@ -292,7 +291,6 @@ for (; model != NULL; model = model->BSIM3V2nextModel)
                    }
                }
 
-#endif /*NOBYPASS*/
                von = here->BSIM3V2von;
                if (*(ckt->CKTstate0 + here->BSIM3V2vds) >= 0.0)
 	       {   vgs = DEVfetlim(vgs, *(ckt->CKTstate0+here->BSIM3V2vgs), von);
@@ -2291,32 +2289,9 @@ finished:
           /*
            *  check convergence
            */
-          if ((here->BSIM3V2off == 0) || (!(ckt->CKTmode & MODEINITFIX)))
-	  {   if (Check == 1)
-	      {   ckt->CKTnoncon++;
-#ifndef NEWCONV
-              } 
-	      else
-              {   if (here->BSIM3V2mode >= 0)
-                  {   Idtot = here->BSIM3V2cd + here->BSIM3V2csub - here->BSIM3V2cbd;
-                  }
-                  else
-                  {   Idtot = here->BSIM3V2cd - here->BSIM3V2cbd;
-                  }
-                  tol = ckt->CKTreltol * MAX(fabs(cdhat), fabs(Idtot))
-                      + ckt->CKTabstol;
-                  if (fabs(cdhat - Idtot) >= tol)
-                  {   ckt->CKTnoncon++;
-                  }
-                  else
-                  {   Ibtot = here->BSIM3V2cbs + here->BSIM3V2cbd - here->BSIM3V2csub;
-                      tol = ckt->CKTreltol * MAX(fabs(cbhat), fabs(Ibtot))
-                          + ckt->CKTabstol;
-                      if (fabs(cbhat - Ibtot)) > tol)
-		      {   ckt->CKTnoncon++;
-                      }
-                  }
-#endif /* NEWCONV */
+          if ((here->BSIM3V2off == 0) || (!(ckt->CKTmode & MODEINITFIX))) {
+	      if (Check == 1) {
+		  ckt->CKTnoncon++;
               }
           }
           *(ckt->CKTstate0 + here->BSIM3V2vbs) = vbs;
diff --git a/src/spicelib/devices/bsim3v2/b3v2noi.c b/src/spicelib/devices/bsim3v2/b3v2noi.c
index e47751308..a5713b93f 100644
--- a/src/spicelib/devices/bsim3v2/b3v2noi.c
+++ b/src/spicelib/devices/bsim3v2/b3v2noi.c
@@ -96,11 +96,11 @@ BSIM3V2noise (mode, operation, inModel, ckt, data, OnDens)
 int mode, operation;
 GENmodel *inModel;
 CKTcircuit *ckt;
-register Ndata *data;
+Ndata *data;
 double *OnDens;
 {
-register BSIM3V2model *model = (BSIM3V2model *)inModel;
-register BSIM3V2instance *here;
+BSIM3V2model *model = (BSIM3V2model *)inModel;
+BSIM3V2instance *here;
 struct BSIM3V2SizeDependParam *pParam;
 char name[N_MXVLNTH];
 double tempOnoise;
diff --git a/src/spicelib/devices/bsim3v2/b3v2pzld.c b/src/spicelib/devices/bsim3v2/b3v2pzld.c
index 60581472c..fd4cc04c7 100644
--- a/src/spicelib/devices/bsim3v2/b3v2pzld.c
+++ b/src/spicelib/devices/bsim3v2/b3v2pzld.c
@@ -16,11 +16,11 @@ File: b3v2pzld.c
 int
 BSIM3V2pzLoad(inModel,ckt,s)
 GENmodel *inModel;
-register CKTcircuit *ckt;
-register SPcomplex *s;
+CKTcircuit *ckt;
+SPcomplex *s;
 {
-register BSIM3V2model *model = (BSIM3V2model*)inModel;
-register BSIM3V2instance *here;
+BSIM3V2model *model = (BSIM3V2model*)inModel;
+BSIM3V2instance *here;
 double xcggb, xcgdb, xcgsb, xcgbb, xcbgb, xcbdb, xcbsb, xcbbb;
 double xcdgb, xcddb, xcdsb, xcdbb, xcsgb, xcsdb, xcssb, xcsbb;
 double gdpr, gspr, gds, gbd, gbs, capbd, capbs, FwdSum, RevSum, Gm, Gmbs;
diff --git a/src/spicelib/devices/bsim3v2/b3v2set.c b/src/spicelib/devices/bsim3v2/b3v2set.c
index 202f09a90..e0547174d 100644
--- a/src/spicelib/devices/bsim3v2/b3v2set.c
+++ b/src/spicelib/devices/bsim3v2/b3v2set.c
@@ -27,13 +27,13 @@ File: b3v2set.c
 
 int
 BSIM3V2setup(matrix,inModel,ckt,states)
-register SMPmatrix *matrix;
-register GENmodel *inModel;
-register CKTcircuit *ckt;
+SMPmatrix *matrix;
+GENmodel *inModel;
+CKTcircuit *ckt;
 int *states;
 {
-register BSIM3V2model *model = (BSIM3V2model*)inModel;
-register BSIM3V2instance *here;
+BSIM3V2model *model = (BSIM3V2model*)inModel;
+BSIM3V2instance *here;
 int error;
 CKTnode *tmp;
 
diff --git a/src/spicelib/devices/bsim3v2/b3v2temp.c b/src/spicelib/devices/bsim3v2/b3v2temp.c
index 072e82398..b1e5dc2da 100644
--- a/src/spicelib/devices/bsim3v2/b3v2temp.c
+++ b/src/spicelib/devices/bsim3v2/b3v2temp.c
@@ -33,8 +33,8 @@ BSIM3V2temp(inModel,ckt)
 GENmodel *inModel;
 CKTcircuit *ckt;
 {
-register BSIM3V2model *model = (BSIM3V2model*) inModel;
-register BSIM3V2instance *here;
+BSIM3V2model *model = (BSIM3V2model*) inModel;
+BSIM3V2instance *here;
 struct BSIM3V2SizeDependParam *pSizeDependParamKnot, *pLastKnot, *pParam;
 double tmp, tmp1, tmp2, tmp3, Eg, Eg0, ni, T0, T1, T2, T3, T4, T5, Ldrn, Wdrn;
 double delTemp, Temp, TRatio, Inv_L, Inv_W, Inv_LW, Dw, Dl, Vtm0, Tnom;
diff --git a/src/spicelib/devices/bsim3v2/b3v2trunc.c b/src/spicelib/devices/bsim3v2/b3v2trunc.c
index f8674e8d5..23b9546ec 100644
--- a/src/spicelib/devices/bsim3v2/b3v2trunc.c
+++ b/src/spicelib/devices/bsim3v2/b3v2trunc.c
@@ -16,11 +16,11 @@ File: b3v2trunc.c
 int
 BSIM3V2trunc(inModel,ckt,timeStep)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 double *timeStep;
 {
-register BSIM3V2model *model = (BSIM3V2model*)inModel;
-register BSIM3V2instance *here;
+BSIM3V2model *model = (BSIM3V2model*)inModel;
+BSIM3V2instance *here;
 
 #ifdef STEPDEBUG
     double debugtemp;
diff --git a/src/spicelib/devices/bsim4/b4acld.c b/src/spicelib/devices/bsim4/b4acld.c
index f7bcb67d5..bdab5a50e 100644
--- a/src/spicelib/devices/bsim4/b4acld.c
+++ b/src/spicelib/devices/bsim4/b4acld.c
@@ -17,10 +17,10 @@
 int
 BSIM4acLoad(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM4model *model = (BSIM4model*)inModel;
-register BSIM4instance *here;
+BSIM4model *model = (BSIM4model*)inModel;
+BSIM4instance *here;
 
 double gjbd, gjbs, geltd, gcrg, gcrgg, gcrgd, gcrgs, gcrgb;
 double xcbgb, xcbdb, xcbsb, xcbbb;
diff --git a/src/spicelib/devices/bsim4/b4check.c b/src/spicelib/devices/bsim4/b4check.c
index 362e9204c..867a32fd7 100644
--- a/src/spicelib/devices/bsim4/b4check.c
+++ b/src/spicelib/devices/bsim4/b4check.c
@@ -20,8 +20,8 @@
 
 int
 BSIM4checkModel(model, here, ckt)
-register BSIM4model *model;
-register BSIM4instance *here;
+BSIM4model *model;
+BSIM4instance *here;
 CKTcircuit *ckt;
 {
 struct bsim4SizeDependParam *pParam;
diff --git a/src/spicelib/devices/bsim4/b4cvtest.c b/src/spicelib/devices/bsim4/b4cvtest.c
index 512c9e1bd..cdc75043f 100644
--- a/src/spicelib/devices/bsim4/b4cvtest.c
+++ b/src/spicelib/devices/bsim4/b4cvtest.c
@@ -21,10 +21,10 @@
 int
 BSIM4convTest(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM4model *model = (BSIM4model*)inModel;
-register BSIM4instance *here;
+BSIM4model *model = (BSIM4model*)inModel;
+BSIM4instance *here;
 double delvbd, delvbs, delvds, delvgd, delvgs;
 double delvdbd, delvsbs; 
 double delvbd_jct, delvbs_jct;
diff --git a/src/spicelib/devices/bsim4/b4ld.c b/src/spicelib/devices/bsim4/b4ld.c
index 1469c0337..70c5a7546 100644
--- a/src/spicelib/devices/bsim4/b4ld.c
+++ b/src/spicelib/devices/bsim4/b4ld.c
@@ -32,10 +32,10 @@
 int
 BSIM4load(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-register BSIM4model *model = (BSIM4model*)inModel;
-register BSIM4instance *here;
+BSIM4model *model = (BSIM4model*)inModel;
+BSIM4instance *here;
 
 double ceqgstot, dgstot_dvd, dgstot_dvg, dgstot_dvs, dgstot_dvb;
 double ceqgdtot, dgdtot_dvd, dgdtot_dvg, dgdtot_dvs, dgdtot_dvb;
@@ -423,7 +423,6 @@ for (; model != NULL; model = model->BSIM4nextModel)
                        + here->BSIM4gdtotb * delvbs;
 
 
-#ifndef NOBYPASS
                /* Following should be one IF statement, but some C compilers 
                 * can't handle that all at once, so we split it into several
                 * successive IF's */
@@ -515,7 +514,6 @@ for (; model != NULL; model = model->BSIM4nextModel)
 		    else
 		       goto line850;
                }
-#endif /*NOBYPASS*/
 
                von = here->BSIM4von;
                if (*(ckt->CKTstate0 + here->BSIM4vds) >= 0.0)
@@ -3254,46 +3252,6 @@ finished:
           if ((here->BSIM4off == 0) || (!(ckt->CKTmode & MODEINITFIX)))
 	  {   if (Check == 1)
 	      {   ckt->CKTnoncon++;
-#ifndef NEWCONV
-              } 
-	      else
-              {   if (here->BSIM4mode >= 0)
-                  {   Idtot = here->BSIM4cd + here->BSIM4csub
-			    + here->BSIM4Igidl - here->BSIM4cbd;
-                  }
-                  else
-                  {   Idtot = here->BSIM4cd + here->BSIM4cbd;
-                  }
-                  tol0 = ckt->CKTreltol * MAX(fabs(cdhat), fabs(Idtot))
-                       + ckt->CKTabstol;
-		  tol1 = ckt->CKTreltol * MAX(fabs(cseshat), fabs(Isestot))
-                       + ckt->CKTabstol;
-                  tol2 = ckt->CKTreltol * MAX(fabs(cdedhat), fabs(Idedtot))
-                       + ckt->CKTabstol;
-                  tol3 = ckt->CKTreltol * MAX(fabs(cgshat), fabs(Igstot))
-                       + ckt->CKTabstol;
-                  tol4 = ckt->CKTreltol * MAX(fabs(cgdhat), fabs(Igdtot))
-                       + ckt->CKTabstol;
-                  tol5 = ckt->CKTreltol * MAX(fabs(cgbhat), fabs(Igbtot))
-                       + ckt->CKTabstol;
-                  if ((fabs(cdhat - Idtot) >= tol0) || (fabs(cseshat - Isestot) >= tol1)
-		      || (fabs(cdedhat - Idedtot) >= tol2))
-                  {   ckt->CKTnoncon++;
-                  }
-		  else if ((fabs(cgshat - Igstot) >= tol3) || (fabs(cgdhat - Igdtot) >= tol4)
-		      || (fabs(cgbhat - Igbtot) >= tol5))
-                  {   ckt->CKTnoncon++;
-                  }
-                  else
-                  {   Ibtot = here->BSIM4cbs + here->BSIM4cbd
-			    - here->BSIM4Igidl - here->BSIM4csub;
-                      tol6 = ckt->CKTreltol * MAX(fabs(cbhat), fabs(Ibtot))
-                          + ckt->CKTabstol;
-                      if (fabs(cbhat - Ibtot) > tol6)
-		      {   ckt->CKTnoncon++;
-                      }
-                  }
-#endif /* NEWCONV */
               }
           }
           *(ckt->CKTstate0 + here->BSIM4vds) = vds;
diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c
index 8f7080df9..fc5ebf799 100644
--- a/src/spicelib/devices/bsim4/b4noi.c
+++ b/src/spicelib/devices/bsim4/b4noi.c
@@ -72,11 +72,11 @@ BSIM4noise (mode, operation, inModel, ckt, data, OnDens)
 int mode, operation;
 GENmodel *inModel;
 CKTcircuit *ckt;
-register Ndata *data;
+Ndata *data;
 double *OnDens;
 {
-register BSIM4model *model = (BSIM4model *)inModel;
-register BSIM4instance *here;
+BSIM4model *model = (BSIM4model *)inModel;
+BSIM4instance *here;
 struct bsim4SizeDependParam *pParam;
 char name[N_MXVLNTH];
 double tempOnoise;
diff --git a/src/spicelib/devices/bsim4/b4pzld.c b/src/spicelib/devices/bsim4/b4pzld.c
index 4e9088740..75f2dab82 100644
--- a/src/spicelib/devices/bsim4/b4pzld.c
+++ b/src/spicelib/devices/bsim4/b4pzld.c
@@ -18,11 +18,11 @@
 int
 BSIM4pzLoad(inModel,ckt,s)
 GENmodel *inModel;
-register CKTcircuit *ckt;
-register SPcomplex *s;
+CKTcircuit *ckt;
+SPcomplex *s;
 {
-register BSIM4model *model = (BSIM4model*)inModel;
-register BSIM4instance *here;
+BSIM4model *model = (BSIM4model*)inModel;
+BSIM4instance *here;
 
 double gjbd, gjbs, geltd, gcrg, gcrgg, gcrgd, gcrgs, gcrgb;
 double xcggb, xcgdb, xcgsb, xcgbb, xcbgb, xcbdb, xcbsb, xcbbb;
diff --git a/src/spicelib/devices/bsim4/b4set.c b/src/spicelib/devices/bsim4/b4set.c
index 76c498764..90ce0e593 100644
--- a/src/spicelib/devices/bsim4/b4set.c
+++ b/src/spicelib/devices/bsim4/b4set.c
@@ -27,13 +27,13 @@
 
 int
 BSIM4setup(matrix,inModel,ckt,states)
-register SMPmatrix *matrix;
-register GENmodel *inModel;
-register CKTcircuit *ckt;
+SMPmatrix *matrix;
+GENmodel *inModel;
+CKTcircuit *ckt;
 int *states;
 {
-register BSIM4model *model = (BSIM4model*)inModel;
-register BSIM4instance *here;
+BSIM4model *model = (BSIM4model*)inModel;
+BSIM4instance *here;
 int error;
 CKTnode *tmp;
 
diff --git a/src/spicelib/devices/bsim4/b4temp.c b/src/spicelib/devices/bsim4/b4temp.c
index 21e27f0a2..bea1d2e99 100644
--- a/src/spicelib/devices/bsim4/b4temp.c
+++ b/src/spicelib/devices/bsim4/b4temp.c
@@ -47,8 +47,8 @@ BSIM4temp(inModel,ckt)
 GENmodel *inModel;
 CKTcircuit *ckt;
 {
-register BSIM4model *model = (BSIM4model*) inModel;
-register BSIM4instance *here;
+BSIM4model *model = (BSIM4model*) inModel;
+BSIM4instance *here;
 struct bsim4SizeDependParam *pSizeDependParamKnot, *pLastKnot, *pParam;
 double tmp, tmp1, tmp2, tmp3, Eg, Eg0, ni;
 double T0, T1, T2, T3, T4, T5, T8, T9, Ldrn, Wdrn;
diff --git a/src/spicelib/devices/bsim4/b4trunc.c b/src/spicelib/devices/bsim4/b4trunc.c
index bb39b7901..609a6e763 100644
--- a/src/spicelib/devices/bsim4/b4trunc.c
+++ b/src/spicelib/devices/bsim4/b4trunc.c
@@ -18,11 +18,11 @@
 int
 BSIM4trunc(inModel,ckt,timeStep)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 double *timeStep;
 {
-register BSIM4model *model = (BSIM4model*)inModel;
-register BSIM4instance *here;
+BSIM4model *model = (BSIM4model*)inModel;
+BSIM4instance *here;
 
 #ifdef STEPDEBUG
     double debugtemp;
diff --git a/src/spicelib/devices/cap/capacld.c b/src/spicelib/devices/cap/capacld.c
index f1990eab7..2b37c34d2 100644
--- a/src/spicelib/devices/cap/capacld.c
+++ b/src/spicelib/devices/cap/capacld.c
@@ -16,12 +16,12 @@ Author: 1985 Thomas L. Quarles
 int
 CAPacLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 
 {
-    register CAPmodel *model = (CAPmodel*)inModel;
+    CAPmodel *model = (CAPmodel*)inModel;
     double val;
-    register CAPinstance *here;
+    CAPinstance *here;
 
     for( ; model != NULL; model = model->CAPnextModel) {
         for( here = model->CAPinstances;here != NULL; 
diff --git a/src/spicelib/devices/cap/capload.c b/src/spicelib/devices/cap/capload.c
index 849233866..765e48964 100644
--- a/src/spicelib/devices/cap/capload.c
+++ b/src/spicelib/devices/cap/capload.c
@@ -15,14 +15,14 @@ int
 CAPload(inModel,ckt)
 
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current capacitance value into the 
          * sparse matrix previously provided 
          */
 {
-    register CAPmodel *model = (CAPmodel*)inModel;
-    register CAPinstance *here;
-    register int cond1;
+    CAPmodel *model = (CAPmodel*)inModel;
+    CAPinstance *here;
+    int cond1;
     double vcap;
     double geq;
     double ceq;
diff --git a/src/spicelib/devices/cap/cappzld.c b/src/spicelib/devices/cap/cappzld.c
index 6f646dd0a..dc53f1da1 100644
--- a/src/spicelib/devices/cap/cappzld.c
+++ b/src/spicelib/devices/cap/cappzld.c
@@ -19,12 +19,12 @@ int
 CAPpzLoad(inModel,ckt,s)
     GENmodel *inModel;
     CKTcircuit *ckt;
-    register SPcomplex *s;
+    SPcomplex *s;
 
 {
-    register CAPmodel *model = (CAPmodel*)inModel;
+    CAPmodel *model = (CAPmodel*)inModel;
     double val;
-    register CAPinstance *here;
+    CAPinstance *here;
 
     for( ; model != NULL; model = model->CAPnextModel) {
         for( here = model->CAPinstances;here != NULL; 
diff --git a/src/spicelib/devices/cap/capsacl.c b/src/spicelib/devices/cap/capsacl.c
index 1109b4e2d..13514dc03 100644
--- a/src/spicelib/devices/cap/capsacl.c
+++ b/src/spicelib/devices/cap/capsacl.c
@@ -22,11 +22,11 @@ int
 CAPsAcLoad(inModel,ckt)
 
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 
 {
-    register CAPmodel *model = (CAPmodel*)inModel;
-    register CAPinstance *here;
+    CAPmodel *model = (CAPmodel*)inModel;
+    CAPinstance *here;
     double vcap;
     double ivcap;
     double val;
diff --git a/src/spicelib/devices/cap/capsetup.c b/src/spicelib/devices/cap/capsetup.c
index bc2abc389..2a69642f2 100644
--- a/src/spicelib/devices/cap/capsetup.c
+++ b/src/spicelib/devices/cap/capsetup.c
@@ -16,7 +16,7 @@ Author: 1985 Thomas L. Quarles
 /*ARGSUSED*/
 int
 CAPsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
     CKTcircuit *ckt;
     int *states;
@@ -25,8 +25,8 @@ CAPsetup(matrix,inModel,ckt,states)
          */
 
 {
-    register CAPmodel *model = (CAPmodel*)inModel;
-    register CAPinstance *here;
+    CAPmodel *model = (CAPmodel*)inModel;
+    CAPinstance *here;
 
     /*  loop through all the capacitor models */
     for( ; model != NULL; model = model->CAPnextModel ) {
diff --git a/src/spicelib/devices/cap/capsload.c b/src/spicelib/devices/cap/capsload.c
index 028f7927b..8761826e3 100644
--- a/src/spicelib/devices/cap/capsload.c
+++ b/src/spicelib/devices/cap/capsload.c
@@ -21,10 +21,10 @@ Author: 1985 Thomas L. Quarles
 int
 CAPsLoad(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-    register CAPmodel *model = (CAPmodel*)inModel;
-    register CAPinstance *here;
+    CAPmodel *model = (CAPmodel*)inModel;
+    CAPinstance *here;
     int      iparmno;
     double   vcap;
     double   Osxp; 
diff --git a/src/spicelib/devices/cap/capsprt.c b/src/spicelib/devices/cap/capsprt.c
index 541a4922b..fe6d440b7 100644
--- a/src/spicelib/devices/cap/capsprt.c
+++ b/src/spicelib/devices/cap/capsprt.c
@@ -21,10 +21,10 @@ Author: 1985 Thomas L. Quarles
 void
 CAPsPrint(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register CAPmodel *model = (CAPmodel*)inModel;
-    register CAPinstance *here;
+    CAPmodel *model = (CAPmodel*)inModel;
+    CAPinstance *here;
 
     printf("CAPACITORS-----------------\n");
     /*  loop through all the capacitor models */
diff --git a/src/spicelib/devices/cap/capsset.c b/src/spicelib/devices/cap/capsset.c
index 8de7c4d6d..c8750c40d 100644
--- a/src/spicelib/devices/cap/capsset.c
+++ b/src/spicelib/devices/cap/capsset.c
@@ -20,12 +20,12 @@ Author: 1985 Thomas L. Quarles
 
 int
 CAPsSetup(info,inModel)
-    register SENstruct *info;
+    SENstruct *info;
     GENmodel *inModel;
 
 {
-    register CAPmodel *model = (CAPmodel*)inModel;
-    register CAPinstance *here;
+    CAPmodel *model = (CAPmodel*)inModel;
+    CAPinstance *here;
 
     /*  loop through all the capacitor models */
     for( ; model != NULL; model = model->CAPnextModel ) {
diff --git a/src/spicelib/devices/cap/capsupd.c b/src/spicelib/devices/cap/capsupd.c
index cf47d6a04..4782314d1 100644
--- a/src/spicelib/devices/cap/capsupd.c
+++ b/src/spicelib/devices/cap/capsupd.c
@@ -19,10 +19,10 @@ Author: 1985 Thomas L. Quarles
 int
 CAPsUpdate(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register CAPmodel *model = (CAPmodel*)inModel;
-    register CAPinstance *here;
+    CAPmodel *model = (CAPmodel*)inModel;
+    CAPinstance *here;
     int      iparmno; 
     double   s1; 
     double   s2; 
diff --git a/src/spicelib/devices/cap/captemp.c b/src/spicelib/devices/cap/captemp.c
index 2c90695bc..47f24a917 100644
--- a/src/spicelib/devices/cap/captemp.c
+++ b/src/spicelib/devices/cap/captemp.c
@@ -24,8 +24,8 @@ CAPtemp(inModel,ckt)
     CKTcircuit *ckt;
 
 {
-    register CAPmodel *model = (CAPmodel*)inModel;
-    register CAPinstance *here;
+    CAPmodel *model = (CAPmodel*)inModel;
+    CAPinstance *here;
 
     /*  loop through all the capacitor models */
     for( ; model != NULL; model = model->CAPnextModel ) {
diff --git a/src/spicelib/devices/cap/captrunc.c b/src/spicelib/devices/cap/captrunc.c
index b7b6a15ee..0e3a86ce6 100644
--- a/src/spicelib/devices/cap/captrunc.c
+++ b/src/spicelib/devices/cap/captrunc.c
@@ -16,11 +16,11 @@ Author: 1985 Thomas L. Quarles
 int
 CAPtrunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
-    register double *timeStep;
+    CKTcircuit *ckt;
+    double *timeStep;
 {
-    register CAPmodel *model = (CAPmodel*)inModel;
-    register CAPinstance *here;
+    CAPmodel *model = (CAPmodel*)inModel;
+    CAPinstance *here;
 
     for( ; model!= NULL; model = model->CAPnextModel) {
         for(here = model->CAPinstances ; here != NULL ;
diff --git a/src/spicelib/devices/cccs/cccsload.c b/src/spicelib/devices/cccs/cccsload.c
index f6576f625..c9d387d1e 100644
--- a/src/spicelib/devices/cccs/cccsload.c
+++ b/src/spicelib/devices/cccs/cccsload.c
@@ -24,8 +24,8 @@ CCCSload(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register CCCSmodel *model = (CCCSmodel*)inModel;
-    register CCCSinstance *here;
+    CCCSmodel *model = (CCCSmodel*)inModel;
+    CCCSinstance *here;
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCCSnextModel ) {
diff --git a/src/spicelib/devices/cccs/cccspzld.c b/src/spicelib/devices/cccs/cccspzld.c
index 8b1269722..535d545c3 100644
--- a/src/spicelib/devices/cccs/cccspzld.c
+++ b/src/spicelib/devices/cccs/cccspzld.c
@@ -26,8 +26,8 @@ CCCSpzLoad(inModel,ckt,s)
          * sparse matrix previously provided 
          */
 {
-    register CCCSmodel *model = (CCCSmodel*)inModel;
-    register CCCSinstance *here;
+    CCCSmodel *model = (CCCSmodel*)inModel;
+    CCCSinstance *here;
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCCSnextModel ) {
diff --git a/src/spicelib/devices/cccs/cccssacl.c b/src/spicelib/devices/cccs/cccssacl.c
index 488b16b91..bbf80e6de 100644
--- a/src/spicelib/devices/cccs/cccssacl.c
+++ b/src/spicelib/devices/cccs/cccssacl.c
@@ -23,8 +23,8 @@ CCCSsAcLoad(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit *ckt;
 {
-    register CCCSmodel *model = (CCCSmodel*)inModel;
-    register CCCSinstance *here;
+    CCCSmodel *model = (CCCSmodel*)inModel;
+    CCCSinstance *here;
     double ic;
     double i_ic;
 
diff --git a/src/spicelib/devices/cccs/cccsset.c b/src/spicelib/devices/cccs/cccsset.c
index 4fb9946cc..26c274f15 100644
--- a/src/spicelib/devices/cccs/cccsset.c
+++ b/src/spicelib/devices/cccs/cccsset.c
@@ -21,13 +21,13 @@ Author: 1985 Thomas L. Quarles
 /*ARGSUSED*/
 int
 CCCSsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     int *states;
 {
-    register CCCSmodel *model = (CCCSmodel*)inModel;
-    register CCCSinstance *here;
+    CCCSmodel *model = (CCCSmodel*)inModel;
+    CCCSinstance *here;
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCCSnextModel ) {
diff --git a/src/spicelib/devices/cccs/cccssld.c b/src/spicelib/devices/cccs/cccssld.c
index 190605d91..a3bae935c 100644
--- a/src/spicelib/devices/cccs/cccssld.c
+++ b/src/spicelib/devices/cccs/cccssld.c
@@ -23,8 +23,8 @@ CCCSsLoad(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit *ckt;
 {
-    register CCCSmodel *model = (CCCSmodel*)inModel;
-    register CCCSinstance *here;
+    CCCSmodel *model = (CCCSmodel*)inModel;
+    CCCSinstance *here;
     double ic ;
 
     /*  loop through all the CCCS models */
diff --git a/src/spicelib/devices/cccs/cccssprt.c b/src/spicelib/devices/cccs/cccssprt.c
index 2a733b672..500fcf548 100644
--- a/src/spicelib/devices/cccs/cccssprt.c
+++ b/src/spicelib/devices/cccs/cccssprt.c
@@ -21,10 +21,10 @@ Author: 1985 Thomas L. Quarles
 void
 CCCSsPrint(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register CCCSmodel *model = (CCCSmodel*)inModel;
-    register CCCSinstance *here;
+    CCCSmodel *model = (CCCSmodel*)inModel;
+    CCCSinstance *here;
 
     printf("CURRENT CONTROLLED CURRENT SOURCES-----------------\n");
     /*  loop through all the voltage source models */
diff --git a/src/spicelib/devices/cccs/cccssset.c b/src/spicelib/devices/cccs/cccssset.c
index 7bd7e58f6..6b537aed7 100644
--- a/src/spicelib/devices/cccs/cccssset.c
+++ b/src/spicelib/devices/cccs/cccssset.c
@@ -20,11 +20,11 @@ Author: 1985 Thomas L. Quarles
 
 int
 CCCSsSetup(info,inModel)
-    register SENstruct *info;
+    SENstruct *info;
     GENmodel *inModel;
 {
-    register CCCSmodel *model = (CCCSmodel*)inModel;
-    register CCCSinstance *here;
+    CCCSmodel *model = (CCCSmodel*)inModel;
+    CCCSinstance *here;
 
     /*  loop through all the CCCS models */
     for( ; model != NULL; model = model->CCCSnextModel ) {
diff --git a/src/spicelib/devices/ccvs/ccvsfbr.c b/src/spicelib/devices/ccvs/ccvsfbr.c
index f5f2c6335..a8b79e3ec 100644
--- a/src/spicelib/devices/ccvs/ccvsfbr.c
+++ b/src/spicelib/devices/ccvs/ccvsfbr.c
@@ -15,12 +15,12 @@ Author: 1985 Thomas L. Quarles
 
 int
 CCVSfindBr(ckt,inModel,name)
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     GENmodel *inModel;
-    register IFuid name;
+    IFuid name;
 {
-    register CCVSmodel *model = (CCVSmodel*)inModel;
-    register CCVSinstance *here;
+    CCVSmodel *model = (CCVSmodel*)inModel;
+    CCVSinstance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/ccvs/ccvsload.c b/src/spicelib/devices/ccvs/ccvsload.c
index a4f0a8387..0cba86663 100644
--- a/src/spicelib/devices/ccvs/ccvsload.c
+++ b/src/spicelib/devices/ccvs/ccvsload.c
@@ -24,8 +24,8 @@ CCVSload(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register CCVSmodel *model = (CCVSmodel*)inModel;
-    register CCVSinstance *here;
+    CCVSmodel *model = (CCVSmodel*)inModel;
+    CCVSinstance *here;
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCVSnextModel ) {
diff --git a/src/spicelib/devices/ccvs/ccvspzld.c b/src/spicelib/devices/ccvs/ccvspzld.c
index ee8b9c0b1..88e3b6e78 100644
--- a/src/spicelib/devices/ccvs/ccvspzld.c
+++ b/src/spicelib/devices/ccvs/ccvspzld.c
@@ -26,8 +26,8 @@ CCVSpzLoad(inModel,ckt,s)
          * sparse matrix previously provided 
          */
 {
-    register CCVSmodel *model = (CCVSmodel*)inModel;
-    register CCVSinstance *here;
+    CCVSmodel *model = (CCVSmodel*)inModel;
+    CCVSinstance *here;
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCVSnextModel ) {
diff --git a/src/spicelib/devices/ccvs/ccvssacl.c b/src/spicelib/devices/ccvs/ccvssacl.c
index 43887ab5c..335c6cd50 100644
--- a/src/spicelib/devices/ccvs/ccvssacl.c
+++ b/src/spicelib/devices/ccvs/ccvssacl.c
@@ -23,8 +23,8 @@ CCVSsAcLoad(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit *ckt;
 {
-    register CCVSmodel *model = (CCVSmodel*)inModel;
-    register CCVSinstance *here;
+    CCVSmodel *model = (CCVSmodel*)inModel;
+    CCVSinstance *here;
     double   ic,i_ic;
 
     /*  loop through all the voltage source models */
diff --git a/src/spicelib/devices/ccvs/ccvsset.c b/src/spicelib/devices/ccvs/ccvsset.c
index 21438e73f..eda1de6ea 100644
--- a/src/spicelib/devices/ccvs/ccvsset.c
+++ b/src/spicelib/devices/ccvs/ccvsset.c
@@ -17,13 +17,13 @@ Author: 1985 Thomas L. Quarles
 /*ARGSUSED*/
 int
 CCVSsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     int *states;
 {
-    register CCVSmodel *model = (CCVSmodel*)inModel;
-    register CCVSinstance *here;
+    CCVSmodel *model = (CCVSmodel*)inModel;
+    CCVSinstance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/ccvs/ccvssld.c b/src/spicelib/devices/ccvs/ccvssld.c
index 82688cb7d..325daf846 100644
--- a/src/spicelib/devices/ccvs/ccvssld.c
+++ b/src/spicelib/devices/ccvs/ccvssld.c
@@ -22,8 +22,8 @@ CCVSsLoad(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit *ckt;
 {
-    register CCVSmodel *model = (CCVSmodel*)inModel;
-    register CCVSinstance *here;
+    CCVSmodel *model = (CCVSmodel*)inModel;
+    CCVSinstance *here;
     double   ic;
 
     /*  loop through all the voltage source models */
diff --git a/src/spicelib/devices/ccvs/ccvssprt.c b/src/spicelib/devices/ccvs/ccvssprt.c
index dc8eb2625..8b28c41ad 100644
--- a/src/spicelib/devices/ccvs/ccvssprt.c
+++ b/src/spicelib/devices/ccvs/ccvssprt.c
@@ -20,10 +20,10 @@ Author: 1985 Thomas L. Quarles
 void
 CCVSsPrint(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register CCVSmodel *model = (CCVSmodel*)inModel;
-    register CCVSinstance *here;
+    CCVSmodel *model = (CCVSmodel*)inModel;
+    CCVSinstance *here;
 
     printf("CURRENT CONTROLLED VOLTAGE SOURCES-----------------\n");
     /*  loop through all the voltage source models */
diff --git a/src/spicelib/devices/ccvs/ccvssset.c b/src/spicelib/devices/ccvs/ccvssset.c
index 101554984..8212eb006 100644
--- a/src/spicelib/devices/ccvs/ccvssset.c
+++ b/src/spicelib/devices/ccvs/ccvssset.c
@@ -19,12 +19,12 @@ Author: 1985 Thomas L. Quarles
 
 int
 CCVSsSetup(info,inModel)
-    register SENstruct *info;
+    SENstruct *info;
     GENmodel *inModel;
 
 {
-    register CCVSmodel *model = (CCVSmodel*)inModel;
-    register CCVSinstance *here;
+    CCVSmodel *model = (CCVSmodel*)inModel;
+    CCVSinstance *here;
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCVSnextModel ) {
diff --git a/src/spicelib/devices/csw/cswacld.c b/src/spicelib/devices/csw/cswacld.c
index 47da954a2..ed99d3175 100644
--- a/src/spicelib/devices/csw/cswacld.c
+++ b/src/spicelib/devices/csw/cswacld.c
@@ -17,15 +17,15 @@ int
 CSWacLoad(inModel,ckt)
 
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 
         /* load the current values into the 
          * sparse matrix previously provided 
          * during AC analysis
          */
 {
-    register CSWmodel *model = (CSWmodel*)inModel;
-    register CSWinstance *here;
+    CSWmodel *model = (CSWmodel*)inModel;
+    CSWinstance *here;
     double g_now;
     int current_state;
 
diff --git a/src/spicelib/devices/csw/cswload.c b/src/spicelib/devices/csw/cswload.c
index 4103852b7..6a5f5eafc 100644
--- a/src/spicelib/devices/csw/cswload.c
+++ b/src/spicelib/devices/csw/cswload.c
@@ -14,14 +14,14 @@ Author: 1985 Gordon Jacobs
 int
 CSWload(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 
         /* actually load the current values into the 
          * sparse matrix previously provided 
          */
 {
-    register CSWmodel *model = (CSWmodel*)inModel;
-    register CSWinstance *here;
+    CSWmodel *model = (CSWmodel*)inModel;
+    CSWinstance *here;
     double g_now;
     double i_ctrl;
     double previous_state; 
diff --git a/src/spicelib/devices/csw/cswnoise.c b/src/spicelib/devices/csw/cswnoise.c
index 35df1e4b1..a47f696f4 100644
--- a/src/spicelib/devices/csw/cswnoise.c
+++ b/src/spicelib/devices/csw/cswnoise.c
@@ -30,12 +30,12 @@ CSWnoise (mode, operation, genmodel, ckt, data, OnDens)
     int operation;
     GENmodel *genmodel;
     CKTcircuit *ckt;
-    register Ndata *data;
+    Ndata *data;
     double *OnDens;
 {
     CSWmodel *firstModel = (CSWmodel *) genmodel;
-    register CSWmodel *model;
-    register CSWinstance *inst;
+    CSWmodel *model;
+    CSWinstance *inst;
     char name[N_MXVLNTH];
     double tempOutNoise;
     double tempInNoise;
diff --git a/src/spicelib/devices/csw/cswpzld.c b/src/spicelib/devices/csw/cswpzld.c
index fa588402b..89ec610da 100644
--- a/src/spicelib/devices/csw/cswpzld.c
+++ b/src/spicelib/devices/csw/cswpzld.c
@@ -18,7 +18,7 @@ Author: 1985 Gordon Jacobs
 int
 CSWpzLoad(inModel,ckt,s)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     SPcomplex *s;
 
         /* load the current values into the 
@@ -26,8 +26,8 @@ CSWpzLoad(inModel,ckt,s)
          * during AC analysis
          */
 {
-    register CSWmodel *model = (CSWmodel*)inModel;
-    register CSWinstance *here;
+    CSWmodel *model = (CSWmodel*)inModel;
+    CSWinstance *here;
     double g_now;
     int current_state;
 
diff --git a/src/spicelib/devices/csw/cswsetup.c b/src/spicelib/devices/csw/cswsetup.c
index 79d84cb9e..0b18572a6 100644
--- a/src/spicelib/devices/csw/cswsetup.c
+++ b/src/spicelib/devices/csw/cswsetup.c
@@ -15,7 +15,7 @@ Author: 1985 Gordon Jacobs
 
 int
 CSWsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
     CKTcircuit *ckt;
     int *states;
@@ -24,8 +24,8 @@ CSWsetup(matrix,inModel,ckt,states)
          */
 
 {
-    register CSWmodel *model = (CSWmodel*)inModel;
-    register CSWinstance *here;
+    CSWmodel *model = (CSWmodel*)inModel;
+    CSWinstance *here;
 
     /*  loop through all the current source models */
     for( ; model != NULL; model = model->CSWnextModel ) {
diff --git a/src/spicelib/devices/dio/dioacld.c b/src/spicelib/devices/dio/dioacld.c
index d04911bfa..f2fa5db91 100644
--- a/src/spicelib/devices/dio/dioacld.c
+++ b/src/spicelib/devices/dio/dioacld.c
@@ -16,14 +16,14 @@ Author: 1985 Thomas L. Quarles
 int
 DIOacLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
+    DIOmodel *model = (DIOmodel*)inModel;
     double gspr;
     double geq;
     double xceq;
-    register DIOinstance *here;
+    DIOinstance *here;
 
     /*  loop through all the diode models */
     for( ; model != NULL; model = model->DIOnextModel ) {
diff --git a/src/spicelib/devices/dio/dioconv.c b/src/spicelib/devices/dio/dioconv.c
index dac6f6b17..f8f4fd718 100644
--- a/src/spicelib/devices/dio/dioconv.c
+++ b/src/spicelib/devices/dio/dioconv.c
@@ -20,8 +20,8 @@ DIOconvTest(inModel,ckt)
         /* Check the devices for convergence
          */
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
-    register DIOinstance *here;
+    DIOmodel *model = (DIOmodel*)inModel;
+    DIOinstance *here;
     double delvd,vd,cdhat,cd;
     double tol;
     /*  loop through all the diode models */
diff --git a/src/spicelib/devices/dio/diodisto.c b/src/spicelib/devices/dio/diodisto.c
index 2f7385722..8de0ec718 100644
--- a/src/spicelib/devices/dio/diodisto.c
+++ b/src/spicelib/devices/dio/diodisto.c
@@ -14,7 +14,7 @@ Author:  1988 Jaijeet S Roychowdhury
 int
 DIOdisto(mode,genmodel,ckt)
  GENmodel *genmodel;
- register CKTcircuit *ckt;
+ CKTcircuit *ckt;
  int mode;
 
 /* assuming here that ckt->CKTomega has been initialised to 
@@ -32,7 +32,7 @@ DIOdisto(mode,genmodel,ckt)
  double r2h11x,i2h11x;
  double r2h1m2x,i2h1m2x;
  double temp, itemp;
- register DIOinstance *here;
+ DIOinstance *here;
 
 if (mode == D_SETUP)
  return(DIOdSetup(model,ckt));
diff --git a/src/spicelib/devices/dio/diodset.c b/src/spicelib/devices/dio/diodset.c
index d1dc69670..cde4ca158 100644
--- a/src/spicelib/devices/dio/diodset.c
+++ b/src/spicelib/devices/dio/diodset.c
@@ -14,13 +14,13 @@ Author:  1988 Jaijeet S Roychowdhury
 int
 DIOdSetup(model,ckt)
 
-register DIOmodel *model;
+DIOmodel *model;
 CKTcircuit *ckt;
 /* actually load the current resistance value into the 
          * sparse matrix previously provided 
          */
 {
-	register DIOinstance *here;
+	DIOinstance *here;
 	double arg;
 	double csat;    /* area-scaled saturation current */
 	double czero;
diff --git a/src/spicelib/devices/dio/dioload.c b/src/spicelib/devices/dio/dioload.c
index 497dc30c0..47c84fc30 100644
--- a/src/spicelib/devices/dio/dioload.c
+++ b/src/spicelib/devices/dio/dioload.c
@@ -21,8 +21,8 @@ DIOload(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
-    register DIOinstance *here;
+    DIOmodel *model = (DIOmodel*)inModel;
+    DIOinstance *here;
     double arg;
     double capd;
     double cd;
@@ -136,7 +136,6 @@ DIOload(inModel,ckt)
                 /*  
                  *   bypass if solution has not changed
                  */
-#ifndef NOBYPASS
                 if ((!(ckt->CKTmode & MODEINITPRED)) && (ckt->CKTbypass)) {
                     tol=ckt->CKTvoltTol + ckt->CKTreltol*
                         MAX(fabs(vd),fabs(*(ckt->CKTstate0 +here->DIOvoltage)));
@@ -153,7 +152,7 @@ DIOload(inModel,ckt)
                         }
                     }
                 }
-#endif /* NOBYPASS */
+
                 /*
                  *   limit new junction voltage
                  */
@@ -272,15 +271,6 @@ next1:      if (vd >= -3*vte) {
                 if (Check == 1)  {
                     ckt->CKTnoncon++;
 		    ckt->CKTtroubleElt = (GENinstance *) here;
-#ifndef NEWCONV
-                } else {
-                    tol=ckt->CKTreltol*
-                            MAX(fabs(cdhat),fabs(cd))+ckt->CKTabstol;
-                    if (fabs(cdhat-cd) > tol) {
-                        ckt->CKTnoncon++;
-			ckt->CKTtroubleElt = (GENinstance *) here;
-                    }
-#endif /* NEWCONV */
                 }
             }
 next2:      *(ckt->CKTstate0 + here->DIOvoltage) = vd;
diff --git a/src/spicelib/devices/dio/dionoise.c b/src/spicelib/devices/dio/dionoise.c
index 29b48086f..624faa0ef 100644
--- a/src/spicelib/devices/dio/dionoise.c
+++ b/src/spicelib/devices/dio/dionoise.c
@@ -30,12 +30,12 @@ DIOnoise (mode, operation, genmodel, ckt, data, OnDens)
     int operation;
     GENmodel *genmodel;
     CKTcircuit *ckt;
-    register Ndata *data;
+    Ndata *data;
     double *OnDens;
 {
     DIOmodel *firstModel = (DIOmodel *) genmodel;
-    register DIOmodel *model;
-    register DIOinstance *inst;
+    DIOmodel *model;
+    DIOinstance *inst;
     char name[N_MXVLNTH];
     double tempOnoise;
     double tempInoise;
diff --git a/src/spicelib/devices/dio/diopzld.c b/src/spicelib/devices/dio/diopzld.c
index 1a9f4a6e9..4f7dff7a4 100644
--- a/src/spicelib/devices/dio/diopzld.c
+++ b/src/spicelib/devices/dio/diopzld.c
@@ -17,14 +17,14 @@ Author: 1985 Thomas L. Quarles
 int
 DIOpzLoad(inModel,ckt,s)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     SPcomplex *s;
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
+    DIOmodel *model = (DIOmodel*)inModel;
     double gspr;
     double geq;
     double xceq;
-    register DIOinstance *here;
+    DIOinstance *here;
 
     /*  loop through all the diode models */
     for( ; model != NULL; model = model->DIOnextModel ) {
diff --git a/src/spicelib/devices/dio/diosacl.c b/src/spicelib/devices/dio/diosacl.c
index cef623b93..3e46bd455 100644
--- a/src/spicelib/devices/dio/diosacl.c
+++ b/src/spicelib/devices/dio/diosacl.c
@@ -24,8 +24,8 @@ DIOsAcLoad(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit *ckt;
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
-    register DIOinstance *here;
+    DIOmodel *model = (DIOmodel*)inModel;
+    DIOinstance *here;
     double SaveState[5];
     int    error;
     int    i;
diff --git a/src/spicelib/devices/dio/diosetup.c b/src/spicelib/devices/dio/diosetup.c
index 6d201853e..4dc60edbc 100644
--- a/src/spicelib/devices/dio/diosetup.c
+++ b/src/spicelib/devices/dio/diosetup.c
@@ -17,13 +17,13 @@ Author: 1985 Thomas L. Quarles
 
 int
 DIOsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
     CKTcircuit *ckt;
     int *states;
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
-    register DIOinstance *here;
+    DIOmodel *model = (DIOmodel*)inModel;
+    DIOinstance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/dio/diosload.c b/src/spicelib/devices/dio/diosload.c
index 937ae39be..864a8a3a5 100644
--- a/src/spicelib/devices/dio/diosload.c
+++ b/src/spicelib/devices/dio/diosload.c
@@ -23,8 +23,8 @@ DIOsLoad(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit *ckt;
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
-    register DIOinstance *here;
+    DIOmodel *model = (DIOmodel*)inModel;
+    DIOinstance *here;
     int    iparmno;
     int    error;
     int    i;
diff --git a/src/spicelib/devices/dio/diosprt.c b/src/spicelib/devices/dio/diosprt.c
index 1db6b8937..280db644a 100644
--- a/src/spicelib/devices/dio/diosprt.c
+++ b/src/spicelib/devices/dio/diosprt.c
@@ -21,10 +21,10 @@ Author: 1985 Thomas L. Quarles
 void
 DIOsPrint(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
-    register DIOinstance *here;
+    DIOmodel *model = (DIOmodel*)inModel;
+    DIOinstance *here;
 
     printf("DIOS-----------------\n");
     /*  loop through all the diode models */
diff --git a/src/spicelib/devices/dio/diosset.c b/src/spicelib/devices/dio/diosset.c
index 9e6bdaefd..afe8f7325 100644
--- a/src/spicelib/devices/dio/diosset.c
+++ b/src/spicelib/devices/dio/diosset.c
@@ -20,11 +20,11 @@ Author: 1985 Thomas L. Quarles
 
 int
 DIOsSetup(info,inModel)
-    register SENstruct *info;
+    SENstruct *info;
     GENmodel *inModel;
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
-    register DIOinstance *here;
+    DIOmodel *model = (DIOmodel*)inModel;
+    DIOinstance *here;
 
     /*  loop through all the diode models */
     for( ; model != NULL; model = model->DIOnextModel ) {
diff --git a/src/spicelib/devices/dio/diosupd.c b/src/spicelib/devices/dio/diosupd.c
index 9e939408c..aa76ef402 100644
--- a/src/spicelib/devices/dio/diosupd.c
+++ b/src/spicelib/devices/dio/diosupd.c
@@ -19,10 +19,10 @@ Author: 1985 Thomas L. Quarles
 int
 DIOsUpdate(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
-    register DIOinstance *here;
+    DIOmodel *model = (DIOmodel*)inModel;
+    DIOinstance *here;
     int      iparmno;
     double   sposprm;
     double   sneg;
diff --git a/src/spicelib/devices/dio/diotemp.c b/src/spicelib/devices/dio/diotemp.c
index d93a90186..6cb7b03b4 100644
--- a/src/spicelib/devices/dio/diotemp.c
+++ b/src/spicelib/devices/dio/diotemp.c
@@ -16,9 +16,9 @@ Author: 1985 Thomas L. Quarles
 int
 DIOtemp(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
+    DIOmodel *model = (DIOmodel*)inModel;
     double xfc;
     double vte;
     double cbv;
@@ -27,8 +27,8 @@ DIOtemp(inModel,ckt)
     double tol;
     double vt;
     double vtnom;
-    register DIOinstance *here;
-    register int iter;
+    DIOinstance *here;
+    int iter;
     char *emsg;
 
     /*  loop through all the diode models */
diff --git a/src/spicelib/devices/dio/diotrunc.c b/src/spicelib/devices/dio/diotrunc.c
index 2e165d78f..1d4b805a3 100644
--- a/src/spicelib/devices/dio/diotrunc.c
+++ b/src/spicelib/devices/dio/diotrunc.c
@@ -16,11 +16,11 @@ Author: 1985 Thomas L. Quarles
 int
 DIOtrunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 {
-    register DIOmodel *model = (DIOmodel*)inModel;
-    register DIOinstance *here;
+    DIOmodel *model = (DIOmodel*)inModel;
+    DIOinstance *here;
 
     for( ; model != NULL; model = model->DIOnextModel) {
         for(here=model->DIOinstances;here!=NULL;here = here->DIOnextInstance){
diff --git a/src/spicelib/devices/ind/indacld.c b/src/spicelib/devices/ind/indacld.c
index 34270665a..ef3a3e3e7 100644
--- a/src/spicelib/devices/ind/indacld.c
+++ b/src/spicelib/devices/ind/indacld.c
@@ -16,11 +16,11 @@ Author: 1985 Thomas L. Quarles
 int
 INDacLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register INDmodel *model = (INDmodel*)inModel;
+    INDmodel *model = (INDmodel*)inModel;
     double val;
-    register INDinstance *here;
+    INDinstance *here;
 
     for( ; model != NULL; model = model->INDnextModel) {
         for( here = model->INDinstances;here != NULL; 
diff --git a/src/spicelib/devices/ind/indload.c b/src/spicelib/devices/ind/indload.c
index df26dfb26..a96301fbc 100644
--- a/src/spicelib/devices/ind/indload.c
+++ b/src/spicelib/devices/ind/indload.c
@@ -18,16 +18,16 @@ Author: 1985 Thomas L. Quarles
 int
 INDload(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register INDmodel *model = (INDmodel*)inModel;
-    register INDinstance *here;
+    INDmodel *model = (INDmodel*)inModel;
+    INDinstance *here;
     double veq;
     double req;
     int error;
 #ifdef MUTUAL
-    register MUTinstance *muthere;
-    register MUTmodel *mutmodel;
+    MUTinstance *muthere;
+    MUTmodel *mutmodel;
     int ktype;
     int itype;
 #endif
diff --git a/src/spicelib/devices/ind/indpzld.c b/src/spicelib/devices/ind/indpzld.c
index b195c304b..d81c63198 100644
--- a/src/spicelib/devices/ind/indpzld.c
+++ b/src/spicelib/devices/ind/indpzld.c
@@ -21,9 +21,9 @@ INDpzLoad(inModel,ckt,s)
     CKTcircuit *ckt;
     SPcomplex *s;
 {
-    register INDmodel *model = (INDmodel*)inModel;
+    INDmodel *model = (INDmodel*)inModel;
     double val;
-    register INDinstance *here;
+    INDinstance *here;
 
     for( ; model != NULL; model = model->INDnextModel) {
         for( here = model->INDinstances;here != NULL; 
diff --git a/src/spicelib/devices/ind/indsacl.c b/src/spicelib/devices/ind/indsacl.c
index 76dbeda9a..289538610 100644
--- a/src/spicelib/devices/ind/indsacl.c
+++ b/src/spicelib/devices/ind/indsacl.c
@@ -18,14 +18,14 @@ Author: 1985 Thomas L. Quarles
 int
 INDsAcLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register INDmodel *model = (INDmodel*)inModel;
-    register INDinstance *here;
+    INDmodel *model = (INDmodel*)inModel;
+    INDinstance *here;
     double  cind,icind,val,ival;     
 #ifdef MUTUAL
-    register MUTinstance *muthere;
-    register MUTmodel *mutmodel;
+    MUTinstance *muthere;
+    MUTmodel *mutmodel;
     double  cind1;
     double  icind1;
     double  cind2;
diff --git a/src/spicelib/devices/ind/indsetup.c b/src/spicelib/devices/ind/indsetup.c
index 04e1965f0..875b1060d 100644
--- a/src/spicelib/devices/ind/indsetup.c
+++ b/src/spicelib/devices/ind/indsetup.c
@@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles
 
 int
 INDsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
     CKTcircuit *ckt;
     int *states;
@@ -21,8 +21,8 @@ INDsetup(matrix,inModel,ckt,states)
          * for fast matrix loading 
          */
 {
-    register INDmodel *model = (INDmodel*)inModel;
-    register INDinstance *here;
+    INDmodel *model = (INDmodel*)inModel;
+    INDinstance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/ind/indsload.c b/src/spicelib/devices/ind/indsload.c
index 7c23b4349..3fd027242 100644
--- a/src/spicelib/devices/ind/indsload.c
+++ b/src/spicelib/devices/ind/indsload.c
@@ -18,10 +18,10 @@ Author: 1985 Thomas L. Quarles
 int
 INDsLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register INDmodel *model = (INDmodel*)inModel;
-    register  INDinstance *here;
+    INDmodel *model = (INDmodel*)inModel;
+     INDinstance *here;
     int       iparmno;
     double    cind;
     double    Osxp;
@@ -30,8 +30,8 @@ INDsLoad(inModel,ckt)
     SENstruct *info;
 
 #ifdef MUTUAL
-    register MUTinstance *muthere;
-    register MUTmodel *mutmodel;
+    MUTinstance *muthere;
+    MUTmodel *mutmodel;
     double   cind1;
     double   cind2;
     double   rootl1;
diff --git a/src/spicelib/devices/ind/indsprt.c b/src/spicelib/devices/ind/indsprt.c
index afc5b6be6..2de24a336 100644
--- a/src/spicelib/devices/ind/indsprt.c
+++ b/src/spicelib/devices/ind/indsprt.c
@@ -18,10 +18,10 @@ Author: 1985 Thomas L. Quarles
 void
 INDsPrint(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-    register INDmodel *model = (INDmodel*)inModel;
-    register INDinstance *here;
+    INDmodel *model = (INDmodel*)inModel;
+    INDinstance *here;
 
     printf("INDUCTORS----------\n");
     /*  loop through all the inductor models */
diff --git a/src/spicelib/devices/ind/indsset.c b/src/spicelib/devices/ind/indsset.c
index c5d1cb785..c1e036742 100644
--- a/src/spicelib/devices/ind/indsset.c
+++ b/src/spicelib/devices/ind/indsset.c
@@ -17,11 +17,11 @@ Author: 1985 Thomas L. Quarles
 
 int
 INDsSetup(info,inModel)
-    register SENstruct *info;
+    SENstruct *info;
     GENmodel *inModel;
 {
-    register INDmodel *model = (INDmodel*)inModel;
-    register INDinstance *here;
+    INDmodel *model = (INDmodel*)inModel;
+    INDinstance *here;
 
     /*  loop through all the inductor models */
     for( ; model != NULL; model = model->INDnextModel ) {
diff --git a/src/spicelib/devices/ind/indsupd.c b/src/spicelib/devices/ind/indsupd.c
index 79fdc0c2b..c9e8fda46 100644
--- a/src/spicelib/devices/ind/indsupd.c
+++ b/src/spicelib/devices/ind/indsupd.c
@@ -16,10 +16,10 @@ Author: 1985 Thomas L. Quarles
 int
 INDsUpdate(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register INDmodel *model = (INDmodel*)inModel;
-    register INDinstance *here;
+    INDmodel *model = (INDmodel*)inModel;
+    INDinstance *here;
     double   cind; 
     double sxp;
     double  s1;
@@ -30,8 +30,8 @@ INDsUpdate(inModel,ckt)
     double  dummy2;
     SENstruct *info;
 #ifdef MUTUAL
-    register MUTinstance *muthere;
-    register MUTmodel *mutmodel;
+    MUTinstance *muthere;
+    MUTmodel *mutmodel;
     double sxp1;
     double sxp2;
     double   cind1,cind2;
diff --git a/src/spicelib/devices/ind/indtrunc.c b/src/spicelib/devices/ind/indtrunc.c
index e97f29b25..c3a4cb26f 100644
--- a/src/spicelib/devices/ind/indtrunc.c
+++ b/src/spicelib/devices/ind/indtrunc.c
@@ -16,11 +16,11 @@ Author: 1985 Thomas L. Quarles
 int
 INDtrunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
-    register double *timeStep;
+    CKTcircuit *ckt;
+    double *timeStep;
 {
-    register INDmodel *model = (INDmodel*)inModel;
-    register INDinstance *here;
+    INDmodel *model = (INDmodel*)inModel;
+    INDinstance *here;
     for( ; model!= NULL; model = model->INDnextModel) {
         for(here = model->INDinstances ; here != NULL ;
                 here = here->INDnextInstance) {
diff --git a/src/spicelib/devices/ind/mutacld.c b/src/spicelib/devices/ind/mutacld.c
index 6ef7121ea..47602fbd3 100644
--- a/src/spicelib/devices/ind/mutacld.c
+++ b/src/spicelib/devices/ind/mutacld.c
@@ -17,11 +17,11 @@ Author: 1985 Thomas L. Quarles
 int
 MUTacLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MUTmodel *model = (MUTmodel*)inModel;
+    MUTmodel *model = (MUTmodel*)inModel;
     double val;
-    register MUTinstance *here;
+    MUTinstance *here;
 
     for( ; model != NULL; model = model->MUTnextModel) {
         for( here = model->MUTinstances;here != NULL; 
diff --git a/src/spicelib/devices/ind/mutpzld.c b/src/spicelib/devices/ind/mutpzld.c
index 983288eda..8b3053dcd 100644
--- a/src/spicelib/devices/ind/mutpzld.c
+++ b/src/spicelib/devices/ind/mutpzld.c
@@ -20,11 +20,11 @@ int
 MUTpzLoad(inModel,ckt,s)
     GENmodel *inModel;
     CKTcircuit *ckt;
-    register SPcomplex *s;
+    SPcomplex *s;
 {
-    register MUTmodel *model = (MUTmodel*)inModel;
+    MUTmodel *model = (MUTmodel*)inModel;
     double val;
-    register MUTinstance *here;
+    MUTinstance *here;
 
     for( ; model != NULL; model = model->MUTnextModel) {
         for( here = model->MUTinstances;here != NULL; 
diff --git a/src/spicelib/devices/ind/mutsetup.c b/src/spicelib/devices/ind/mutsetup.c
index 16d67a50d..6bce9baf5 100644
--- a/src/spicelib/devices/ind/mutsetup.c
+++ b/src/spicelib/devices/ind/mutsetup.c
@@ -21,13 +21,13 @@ Author: 1985 Thomas L. Quarles
 /*ARGSUSED*/
 int
 MUTsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
     CKTcircuit *ckt;
     int *states;
 {
-    register MUTmodel *model = (MUTmodel*)inModel;
-    register MUTinstance *here;
+    MUTmodel *model = (MUTmodel*)inModel;
+    MUTinstance *here;
     int ktype;
     int error;
 
diff --git a/src/spicelib/devices/ind/mutsprt.c b/src/spicelib/devices/ind/mutsprt.c
index 7bd8035e6..f70466afb 100644
--- a/src/spicelib/devices/ind/mutsprt.c
+++ b/src/spicelib/devices/ind/mutsprt.c
@@ -23,8 +23,8 @@ MUTsPrint(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit* ckt;
 {
-    register MUTmodel *model = (MUTmodel*)inModel;
-    register MUTinstance *here;
+    MUTmodel *model = (MUTmodel*)inModel;
+    MUTinstance *here;
 
     printf("MUTUAL INDUCTORS-----------------\n");
     /*  loop through all the inductor models */
diff --git a/src/spicelib/devices/ind/mutsset.c b/src/spicelib/devices/ind/mutsset.c
index e264dec0b..fafcdecb2 100644
--- a/src/spicelib/devices/ind/mutsset.c
+++ b/src/spicelib/devices/ind/mutsset.c
@@ -20,11 +20,11 @@ Author: 1985 Thomas L. Quarles
 /*ARGSUSED*/
 int
 MUTsSetup(info,inModel)
-    register SENstruct *info;
+    SENstruct *info;
     GENmodel *inModel;
 {
-    register MUTmodel *model = (MUTmodel*)inModel;
-    register MUTinstance *here;
+    MUTmodel *model = (MUTmodel*)inModel;
+    MUTinstance *here;
 
     /*  loop through all the inductor models */
     for( ; model != NULL; model = model->MUTnextModel ) {
diff --git a/src/spicelib/devices/isrc/isrcacct.c b/src/spicelib/devices/isrc/isrcacct.c
index e0bcaa851..62794b451 100644
--- a/src/spicelib/devices/isrc/isrcacct.c
+++ b/src/spicelib/devices/isrc/isrcacct.c
@@ -13,12 +13,12 @@ Author: 1985 Thomas L. Quarles
 
 int
 ISRCaccept(ckt,inModel)
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     GENmodel *inModel;
         /* set up the breakpoint table.  */
 {
-    register ISRCmodel *model = (ISRCmodel*)inModel;
-    register ISRCinstance *here;
+    ISRCmodel *model = (ISRCmodel*)inModel;
+    ISRCinstance *here;
     int error;
 
     /*  loop through all the voltage source models */
@@ -134,7 +134,7 @@ ISRCaccept(ckt,inModel)
                 }
                 break;
                 case PWL: {
-                    register int i;
+                    int i;
                     if(ckt->CKTtime < *(here->ISRCcoeffs)) {
                         if(ckt->CKTbreak) {
                             error = CKTsetBreak(ckt,*(here->ISRCcoeffs));
diff --git a/src/spicelib/devices/isrc/isrcacld.c b/src/spicelib/devices/isrc/isrcacld.c
index 82b79b61b..6db0d79b5 100644
--- a/src/spicelib/devices/isrc/isrcacld.c
+++ b/src/spicelib/devices/isrc/isrcacld.c
@@ -13,10 +13,10 @@ Author: 1985 Thomas L. Quarles
 int
 ISRCacLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register ISRCmodel *model = (ISRCmodel*)inModel;
-    register ISRCinstance *here;
+    ISRCmodel *model = (ISRCmodel*)inModel;
+    ISRCinstance *here;
 
     for( ; model != NULL; model = model->ISRCnextModel ) {
 
diff --git a/src/spicelib/devices/isrc/isrcload.c b/src/spicelib/devices/isrc/isrcload.c
index 2fe5a344b..ea22be165 100644
--- a/src/spicelib/devices/isrc/isrcload.c
+++ b/src/spicelib/devices/isrc/isrcload.c
@@ -14,13 +14,13 @@ Author: 1985 Thomas L. Quarles
 int
 ISRCload(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current current value into the 
          * sparse matrix previously provided 
          */
 {
-    register ISRCmodel *model = (ISRCmodel*)inModel;
-    register ISRCinstance *here;
+    ISRCmodel *model = (ISRCmodel*)inModel;
+    ISRCinstance *here;
     double value;
     double time;
 
@@ -160,7 +160,7 @@ ISRCload(inModel,ckt)
                     value = here->ISRCdcValue * ckt->CKTsrcFact;
                     break;
                 case PWL: {
-                    register int i;
+                    int i;
                     if(time< *(here->ISRCcoeffs)) {
                         value = *(here->ISRCcoeffs + 1) ;
                         break;
diff --git a/src/spicelib/devices/isrc/isrctemp.c b/src/spicelib/devices/isrc/isrctemp.c
index 94ea5207c..a8a26f16b 100644
--- a/src/spicelib/devices/isrc/isrctemp.c
+++ b/src/spicelib/devices/isrc/isrctemp.c
@@ -17,8 +17,8 @@ ISRCtemp(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit *ckt;
 {
-    register ISRCmodel *model = (ISRCmodel*)inModel;
-    register ISRCinstance *here;
+    ISRCmodel *model = (ISRCmodel*)inModel;
+    ISRCinstance *here;
     double radians;
 
     for( ; model != NULL; model = model->ISRCnextModel ) {
diff --git a/src/spicelib/devices/jfet/jfetacld.c b/src/spicelib/devices/jfet/jfetacld.c
index 151fe9a6b..86aab0d6f 100644
--- a/src/spicelib/devices/jfet/jfetacld.c
+++ b/src/spicelib/devices/jfet/jfetacld.c
@@ -16,10 +16,10 @@ Author: 1985 Thomas L. Quarles
 int
 JFETacLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register JFETmodel *model = (JFETmodel*)inModel;
-    register JFETinstance *here;
+    JFETmodel *model = (JFETmodel*)inModel;
+    JFETinstance *here;
     double gdpr;
     double gspr;
     double gm;
diff --git a/src/spicelib/devices/jfet/jfetdist.c b/src/spicelib/devices/jfet/jfetdist.c
index 0df391a14..522eb6a27 100644
--- a/src/spicelib/devices/jfet/jfetdist.c
+++ b/src/spicelib/devices/jfet/jfetdist.c
@@ -14,7 +14,7 @@ Author: 1988 Jaijeet S Roychowdhury
 int
 JFETdisto(mode,genmodel,ckt)
  GENmodel *genmodel;
- register CKTcircuit *ckt;
+ CKTcircuit *ckt;
  int mode;
 
 /* assuming here that ckt->CKTomega has been initialised to 
@@ -35,7 +35,7 @@ JFETdisto(mode,genmodel,ckt)
  double r2h1m2x,i2h1m2x;
  double r2h1m2y,i2h1m2y;
  double temp, itemp;
- register JFETinstance *here;
+ JFETinstance *here;
 
 if (mode == D_SETUP)
  return(JFETdSetup(model,ckt));
diff --git a/src/spicelib/devices/jfet/jfetdset.c b/src/spicelib/devices/jfet/jfetdset.c
index f11051946..d2aa4cc4b 100644
--- a/src/spicelib/devices/jfet/jfetdset.c
+++ b/src/spicelib/devices/jfet/jfetdset.c
@@ -22,8 +22,8 @@ JFETdSetup(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register JFETmodel *model = (JFETmodel*)inModel;
-    register JFETinstance *here;
+    JFETmodel *model = (JFETmodel*)inModel;
+    JFETinstance *here;
     double beta;
     double betap;
     double lcapgd1;
diff --git a/src/spicelib/devices/jfet/jfetload.c b/src/spicelib/devices/jfet/jfetload.c
index 60d6a4e62..cd959d1fb 100644
--- a/src/spicelib/devices/jfet/jfetload.c
+++ b/src/spicelib/devices/jfet/jfetload.c
@@ -24,8 +24,8 @@ JFETload(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register JFETmodel *model = (JFETmodel*)inModel;
-    register JFETinstance *here;
+    JFETmodel *model = (JFETmodel*)inModel;
+    JFETinstance *here;
     double beta;
     double betap;
     double capgd;
@@ -389,16 +389,13 @@ JFETload(inModel,ckt)
             /*
              *  check convergence 
              */
-            if( (!(ckt->CKTmode & MODEINITFIX)) | (!(ckt->CKTmode & MODEUIC))) {
-                if( (icheck == 1)
-#ifndef NEWCONV
-/* XXX */
-#endif /*NEWCONV*/
-                        || (fabs(cghat-cg) >= ckt->CKTreltol*
-                            MAX(fabs(cghat),fabs(cg))+ckt->CKTabstol) ||
-                        (fabs(cdhat-cd) > ckt->CKTreltol*
-                            MAX(fabs(cdhat),fabs(cd))+ckt->CKTabstol) 
-                        ) {
+            if( (!(ckt->CKTmode & MODEINITFIX)) |
+		(!(ckt->CKTmode & MODEUIC))) {
+		if((icheck == 1) ||
+		   (fabs(cghat-cg) >= ckt->CKTreltol *
+		    MAX(fabs(cghat), fabs(cg)) + ckt->CKTabstol) ||
+		   (fabs(cdhat-cd) > ckt->CKTreltol *
+		    MAX(fabs(cdhat), fabs(cd)) + ckt->CKTabstol)) {
                     ckt->CKTnoncon++;
 		    ckt->CKTtroubleElt = (GENinstance *) here;
                 }
diff --git a/src/spicelib/devices/jfet/jfetnoi.c b/src/spicelib/devices/jfet/jfetnoi.c
index 30f2378fc..0f30658bd 100644
--- a/src/spicelib/devices/jfet/jfetnoi.c
+++ b/src/spicelib/devices/jfet/jfetnoi.c
@@ -29,12 +29,12 @@ JFETnoise (mode, operation, genmodel, ckt, data, OnDens)
     int operation;
     GENmodel *genmodel;
     CKTcircuit *ckt;
-    register Ndata *data;
+    Ndata *data;
     double *OnDens;
 {
     JFETmodel *firstModel = (JFETmodel *) genmodel;
-    register JFETmodel *model;
-    register JFETinstance *inst;
+    JFETmodel *model;
+    JFETinstance *inst;
     char name[N_MXVLNTH];
     double tempOnoise;
     double tempInoise;
diff --git a/src/spicelib/devices/jfet/jfetpzld.c b/src/spicelib/devices/jfet/jfetpzld.c
index 997cf0af3..f7ac0de00 100644
--- a/src/spicelib/devices/jfet/jfetpzld.c
+++ b/src/spicelib/devices/jfet/jfetpzld.c
@@ -17,11 +17,11 @@ Author: 1985 Thomas L. Quarles
 int
 JFETpzLoad(inModel,ckt,s)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
-    register SPcomplex *s;
+    CKTcircuit *ckt;
+    SPcomplex *s;
 {
-    register JFETmodel *model = (JFETmodel*)inModel;
-    register JFETinstance *here;
+    JFETmodel *model = (JFETmodel*)inModel;
+    JFETinstance *here;
     double gdpr;
     double gspr;
     double gm;
diff --git a/src/spicelib/devices/jfet/jfetset.c b/src/spicelib/devices/jfet/jfetset.c
index 5902604fe..e58d92b04 100644
--- a/src/spicelib/devices/jfet/jfetset.c
+++ b/src/spicelib/devices/jfet/jfetset.c
@@ -17,7 +17,7 @@ Sydney University mods Copyright(c) 1989 Anthony E. Parker, David J. Skellern
 
 int
 JFETsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
     CKTcircuit *ckt;
     int *states;
@@ -25,8 +25,8 @@ JFETsetup(matrix,inModel,ckt,states)
          * for fast matrix loading 
          */
 {
-    register JFETmodel *model = (JFETmodel*)inModel;
-    register JFETinstance *here;
+    JFETmodel *model = (JFETmodel*)inModel;
+    JFETinstance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/jfet/jfettemp.c b/src/spicelib/devices/jfet/jfettemp.c
index 0fa92c6ad..6f048fce4 100644
--- a/src/spicelib/devices/jfet/jfettemp.c
+++ b/src/spicelib/devices/jfet/jfettemp.c
@@ -22,8 +22,8 @@ JFETtemp(inModel,ckt)
         /* Pre-process the model parameters after a possible change
          */
 {
-    register JFETmodel *model = (JFETmodel*)inModel;
-    register JFETinstance *here;
+    JFETmodel *model = (JFETmodel*)inModel;
+    JFETinstance *here;
     double xfc;
     double vt;
     double vtnom;
diff --git a/src/spicelib/devices/jfet/jfettrun.c b/src/spicelib/devices/jfet/jfettrun.c
index 8af535469..4dc854896 100644
--- a/src/spicelib/devices/jfet/jfettrun.c
+++ b/src/spicelib/devices/jfet/jfettrun.c
@@ -16,11 +16,11 @@ Author: 1985 Thomas L. Quarles
 int
 JFETtrunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 {
-    register JFETmodel *model = (JFETmodel*)inModel;
-    register JFETinstance *here;
+    JFETmodel *model = (JFETmodel*)inModel;
+    JFETinstance *here;
 
     for( ; model != NULL; model = model->JFETnextModel) {
         for(here=model->JFETinstances;here!=NULL;here = here->JFETnextInstance){
diff --git a/src/spicelib/devices/jfet2/jfet2acld.c b/src/spicelib/devices/jfet2/jfet2acld.c
index c2d441419..622162d40 100644
--- a/src/spicelib/devices/jfet2/jfet2acld.c
+++ b/src/spicelib/devices/jfet2/jfet2acld.c
@@ -19,10 +19,10 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker )
 int
 JFET2acLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register JFET2model *model = (JFET2model*)inModel;
-    register JFET2instance *here;
+    JFET2model *model = (JFET2model*)inModel;
+    JFET2instance *here;
     double gdpr;
     double gspr;
     double gm;
diff --git a/src/spicelib/devices/jfet2/jfet2load.c b/src/spicelib/devices/jfet2/jfet2load.c
index 0e24f1aba..a04d9342a 100644
--- a/src/spicelib/devices/jfet2/jfet2load.c
+++ b/src/spicelib/devices/jfet2/jfet2load.c
@@ -27,8 +27,8 @@ JFET2load(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register JFET2model *model = (JFET2model*)inModel;
-    register JFET2instance *here;
+    JFET2model *model = (JFET2model*)inModel;
+    JFET2instance *here;
     double capgd;
     double capgs;
     double cd;
@@ -271,15 +271,11 @@ JFET2load(inModel,ckt)
              *  check convergence 
              */
             if( (!(ckt->CKTmode & MODEINITFIX)) | (!(ckt->CKTmode & MODEUIC))) {
-                if( (icheck == 1)
-#ifndef NEWCONV
-/* XXX */
-#endif /*NEWCONV*/
-                        || (fabs(cghat-cg) >= ckt->CKTreltol*
-                            MAX(fabs(cghat),fabs(cg))+ckt->CKTabstol) ||
-                        (fabs(cdhat-cd) > ckt->CKTreltol*
-                            MAX(fabs(cdhat),fabs(cd))+ckt->CKTabstol) 
-                        ) {
+                if((icheck == 1) ||
+		   (fabs(cghat-cg) >= ckt->CKTreltol*
+		    MAX(fabs(cghat),fabs(cg))+ckt->CKTabstol) ||
+		   (fabs(cdhat-cd) > ckt->CKTreltol*
+		    MAX(fabs(cdhat),fabs(cd))+ckt->CKTabstol)) {
                     ckt->CKTnoncon++;
 		    ckt->CKTtroubleElt = (GENinstance *) here;
                 }
diff --git a/src/spicelib/devices/jfet2/jfet2noi.c b/src/spicelib/devices/jfet2/jfet2noi.c
index 49de6a1fd..a7dc49aca 100644
--- a/src/spicelib/devices/jfet2/jfet2noi.c
+++ b/src/spicelib/devices/jfet2/jfet2noi.c
@@ -33,12 +33,12 @@ JFET2noise (mode, operation, genmodel, ckt, data, OnDens)
     int operation;
     GENmodel *genmodel;
     CKTcircuit *ckt;
-    register Ndata *data;
+    Ndata *data;
     double *OnDens;
 {
     JFET2model *firstModel = (JFET2model *) genmodel;
-    register JFET2model *model;
-    register JFET2instance *inst;
+    JFET2model *model;
+    JFET2instance *inst;
     char name[N_MXVLNTH];
     double tempOnoise;
     double tempInoise;
diff --git a/src/spicelib/devices/jfet2/jfet2set.c b/src/spicelib/devices/jfet2/jfet2set.c
index 3a93e006e..12f2a6559 100644
--- a/src/spicelib/devices/jfet2/jfet2set.c
+++ b/src/spicelib/devices/jfet2/jfet2set.c
@@ -19,7 +19,7 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker )
 
 int
 JFET2setup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
     CKTcircuit *ckt;
     int *states;
@@ -27,8 +27,8 @@ JFET2setup(matrix,inModel,ckt,states)
          * for fast matrix loading 
          */
 {
-    register JFET2model *model = (JFET2model*)inModel;
-    register JFET2instance *here;
+    JFET2model *model = (JFET2model*)inModel;
+    JFET2instance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/jfet2/jfet2temp.c b/src/spicelib/devices/jfet2/jfet2temp.c
index fa28fcf0b..64c919806 100644
--- a/src/spicelib/devices/jfet2/jfet2temp.c
+++ b/src/spicelib/devices/jfet2/jfet2temp.c
@@ -27,8 +27,8 @@ JFET2temp(inModel,ckt)
         /* Pre-process the model parameters after a possible change
          */
 {
-    register JFET2model *model = (JFET2model*)inModel;
-    register JFET2instance *here;
+    JFET2model *model = (JFET2model*)inModel;
+    JFET2instance *here;
     double xfc;
     double vt;
     double vtnom;
diff --git a/src/spicelib/devices/jfet2/jfet2trun.c b/src/spicelib/devices/jfet2/jfet2trun.c
index 07b687bc6..9df728ad4 100644
--- a/src/spicelib/devices/jfet2/jfet2trun.c
+++ b/src/spicelib/devices/jfet2/jfet2trun.c
@@ -20,11 +20,11 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker )
 int
 JFET2trunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 {
-    register JFET2model *model = (JFET2model*)inModel;
-    register JFET2instance *here;
+    JFET2model *model = (JFET2model*)inModel;
+    JFET2instance *here;
 
     for( ; model != NULL; model = model->JFET2nextModel) {
         for(here=model->JFET2instances;here!=NULL;here = here->JFET2nextInstance){
diff --git a/src/spicelib/devices/ltra/ltraacct.c b/src/spicelib/devices/ltra/ltraacct.c
index f060519ce..0788e809c 100644
--- a/src/spicelib/devices/ltra/ltraacct.c
+++ b/src/spicelib/devices/ltra/ltraacct.c
@@ -12,11 +12,11 @@ Author: 1990 Jaijeet S. Roychowdhury
 
 int
 LTRAaccept(ckt, inModel)
-  register CKTcircuit *ckt;
+  CKTcircuit *ckt;
   GENmodel *inModel;
 {
-  register LTRAmodel *model = (LTRAmodel *) inModel;
-  register LTRAinstance *here;
+  LTRAmodel *model = (LTRAmodel *) inModel;
+  LTRAinstance *here;
   double v1, v2, v3, v4;
   double v5, v6, d1, d2, d3, d4;
   int tmp_test;
diff --git a/src/spicelib/devices/ltra/ltraacld.c b/src/spicelib/devices/ltra/ltraacld.c
index 1b43c4ea3..ec7718a54 100644
--- a/src/spicelib/devices/ltra/ltraacld.c
+++ b/src/spicelib/devices/ltra/ltraacld.c
@@ -21,8 +21,8 @@ LTRAacLoad(inModel, ckt)
  * matrix and the right-hand-side vector
  */
 {
-  register LTRAmodel *model = (LTRAmodel *) inModel;
-  register LTRAinstance *here;
+  LTRAmodel *model = (LTRAmodel *) inModel;
+  LTRAinstance *here;
   double y0_r, y0_i, lambda_r, lambda_i, mag, theta;
   double exparg_r, exparg_i, explambda_r, explambda_i;
   double y0exp_r, y0exp_i;
diff --git a/src/spicelib/devices/ltra/ltraload.c b/src/spicelib/devices/ltra/ltraload.c
index d3bd91d1d..f9203236f 100644
--- a/src/spicelib/devices/ltra/ltraload.c
+++ b/src/spicelib/devices/ltra/ltraload.c
@@ -14,14 +14,14 @@ Author: 1990 Jaijeet S. Roychowdhury
 int
 LTRAload(inModel, ckt)
   GENmodel *inModel;
-  register CKTcircuit *ckt;
+  CKTcircuit *ckt;
 /*
  * load the appropriate values for the current timepoint into the sparse
  * matrix and the right-hand-side vector
  */
 {
-  register LTRAmodel *model = (LTRAmodel *) inModel;
-  register LTRAinstance *here;
+  LTRAmodel *model = (LTRAmodel *) inModel;
+  LTRAinstance *here;
   double t1, t2, t3;
   double qf1, qf2, qf3;
   double lf2, lf3;
@@ -29,7 +29,7 @@ LTRAload(inModel, ckt)
   double dummy1, dummy2;
   int isaved;
   unsigned tdover;
-  register int i;
+  int i;
   double max, min;
 
   /* loop through all the transmission line models */
diff --git a/src/spicelib/devices/ltra/ltramisc.c b/src/spicelib/devices/ltra/ltramisc.c
index 5085660e2..c63aa4535 100644
--- a/src/spicelib/devices/ltra/ltramisc.c
+++ b/src/spicelib/devices/ltra/ltramisc.c
@@ -855,7 +855,7 @@ LTRAstraightLineCheck(x1, y1, x2, y2, x3, y3, reltol, abstol)
 
 double
 LTRAlteCalculate(ckt, genmodel, geninstance, curtime)
-  register CKTcircuit *ckt;
+  CKTcircuit *ckt;
   GENmodel *genmodel;
   GENinstance *geninstance;
   double curtime;
@@ -1427,8 +1427,8 @@ LTRAlteCalculate(ckt, genmodel, geninstance, curtime)
  */
 
 /*
- * double LTRAlteCalculate(ckt,model,instance,curtime) register CKTcircuit *ckt;
- * register LTRAmodel *model; register LTRAinstance *instance; double
+ * double LTRAlteCalculate(ckt,model,instance,curtime) CKTcircuit *ckt;
+ * LTRAmodel *model; register LTRAinstance *instance; double
  * curtime;
  * 
  * { double *h1dashTcoeffs, h1dashTfirstCoeff; double *h2Tcoeffs, h2TfirstCoeff;
diff --git a/src/spicelib/devices/ltra/ltraset.c b/src/spicelib/devices/ltra/ltraset.c
index 6d653a20b..411af0af5 100644
--- a/src/spicelib/devices/ltra/ltraset.c
+++ b/src/spicelib/devices/ltra/ltraset.c
@@ -13,17 +13,17 @@ Author: 1990 Jaijeet S. Roychowdhury
 
 int
 LTRAsetup(matrix, inModel, ckt, state)
-  register SMPmatrix *matrix;
+  SMPmatrix *matrix;
   GENmodel *inModel;
-  register CKTcircuit *ckt;
+  CKTcircuit *ckt;
   int *state;
 /*
  * load the transmission line structure with those pointers needed later for
  * fast matrix loading
  */
 {
-  register LTRAmodel *model = (LTRAmodel *) inModel;
-  register LTRAinstance *here;
+  LTRAmodel *model = (LTRAmodel *) inModel;
+  LTRAinstance *here;
   int error;
   CKTnode *tmp;
 
diff --git a/src/spicelib/devices/ltra/ltratemp.c b/src/spicelib/devices/ltra/ltratemp.c
index 6fc3bcd91..2bc3c5f4d 100644
--- a/src/spicelib/devices/ltra/ltratemp.c
+++ b/src/spicelib/devices/ltra/ltratemp.c
@@ -20,8 +20,8 @@ LTRAtemp(inModel, ckt)
  * pre-process parameters for later use
  */
 {
-  register LTRAmodel *model = (LTRAmodel *) inModel;
-  register LTRAinstance *here;
+  LTRAmodel *model = (LTRAmodel *) inModel;
+  LTRAinstance *here;
 
   /* loop through all the transmission line models */
   for (; model != NULL; model = model->LTRAnextModel) {
diff --git a/src/spicelib/devices/ltra/ltratrun.c b/src/spicelib/devices/ltra/ltratrun.c
index 550784ee8..76d85050e 100644
--- a/src/spicelib/devices/ltra/ltratrun.c
+++ b/src/spicelib/devices/ltra/ltratrun.c
@@ -13,12 +13,12 @@ Author: 1990 Jaijeet S. Roychowdhury
 int
 LTRAtrunc(inModel, ckt, timeStep)
   GENmodel *inModel;
-  register CKTcircuit *ckt;
+  CKTcircuit *ckt;
   double *timeStep;
 
 {
-  register LTRAmodel *model = (LTRAmodel *) inModel;
-  register LTRAinstance *here;
+  LTRAmodel *model = (LTRAmodel *) inModel;
+  LTRAinstance *here;
   double i1, i2, i3, i4;
   double i5, i6, d1, d2, d3, d4;
   double tmp;
diff --git a/src/spicelib/devices/mes/mesacl.c b/src/spicelib/devices/mes/mesacl.c
index 4142e2e70..8cc25d8c9 100644
--- a/src/spicelib/devices/mes/mesacl.c
+++ b/src/spicelib/devices/mes/mesacl.c
@@ -16,10 +16,10 @@ Author: 1985 S. Hwang
 int
 MESacLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MESmodel *model = (MESmodel*)inModel;
-    register MESinstance *here;
+    MESmodel *model = (MESmodel*)inModel;
+    MESinstance *here;
     double gdpr;
     double gspr;
     double gm;
diff --git a/src/spicelib/devices/mes/mesdisto.c b/src/spicelib/devices/mes/mesdisto.c
index ef6f35319..bd02a9cdc 100644
--- a/src/spicelib/devices/mes/mesdisto.c
+++ b/src/spicelib/devices/mes/mesdisto.c
@@ -14,7 +14,7 @@ Author: 1988 Jaijeet S Roychowdhury
 int
 MESdisto(mode,genmodel,ckt)
  GENmodel *genmodel;
- register CKTcircuit *ckt;
+ CKTcircuit *ckt;
  int mode;
 
 /* assuming here that ckt->CKTomega has been initialised to 
@@ -35,7 +35,7 @@ MESdisto(mode,genmodel,ckt)
  double r2h1m2x,i2h1m2x;
  double r2h1m2y,i2h1m2y;
  double temp, itemp;
- register MESinstance *here;
+ MESinstance *here;
 
 if (mode == D_SETUP)
  return(MESdSetup(model,ckt));
diff --git a/src/spicelib/devices/mes/mesdset.c b/src/spicelib/devices/mes/mesdset.c
index 0a49e0f42..c92398018 100644
--- a/src/spicelib/devices/mes/mesdset.c
+++ b/src/spicelib/devices/mes/mesdset.c
@@ -21,8 +21,8 @@ MESdSetup(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register MESmodel *model = (MESmodel*)inModel;
-    register MESinstance *here;
+    MESmodel *model = (MESmodel*)inModel;
+    MESinstance *here;
     double afact;
     double beta;
     double betap;
diff --git a/src/spicelib/devices/mes/mesload.c b/src/spicelib/devices/mes/mesload.c
index 7e2cc1f9e..6cf322ee3 100644
--- a/src/spicelib/devices/mes/mesload.c
+++ b/src/spicelib/devices/mes/mesload.c
@@ -29,8 +29,8 @@ MESload(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register MESmodel *model = (MESmodel*)inModel;
-    register MESinstance *here;
+    MESmodel *model = (MESmodel*)inModel;
+    MESinstance *here;
     double afact;
     double beta;
     double betap;
@@ -399,15 +399,11 @@ MESload(inModel,ckt)
              *  check convergence 
              */
             if( (!(ckt->CKTmode & MODEINITFIX)) | (!(ckt->CKTmode & MODEUIC))) {
-                if( (icheck == 1) 
-#ifndef NEWCONV
-/* XXX */
-#endif /* NEWCONV */
-                        || (fabs(cghat-cg) >= ckt->CKTreltol*
-                            MAX(fabs(cghat),fabs(cg))+ckt->CKTabstol) ||
-                        (fabs(cdhat-cd) > ckt->CKTreltol*
-                            MAX(fabs(cdhat),fabs(cd))+ckt->CKTabstol) 
-                        ) {
+		if((icheck == 1) ||
+		   (fabs(cghat-cg) >= ckt->CKTreltol *
+		    MAX(fabs(cghat),fabs(cg))+ckt->CKTabstol) ||
+		   (fabs(cdhat-cd) > ckt->CKTreltol*
+		    MAX(fabs(cdhat),fabs(cd))+ckt->CKTabstol)) {
                     ckt->CKTnoncon++;
 		    ckt->CKTtroubleElt = (GENinstance *) here;
                 }
diff --git a/src/spicelib/devices/mes/mesnoise.c b/src/spicelib/devices/mes/mesnoise.c
index b72d150c7..d715068de 100644
--- a/src/spicelib/devices/mes/mesnoise.c
+++ b/src/spicelib/devices/mes/mesnoise.c
@@ -29,12 +29,12 @@ MESnoise (mode, operation, genmodel, ckt, data, OnDens)
     int operation;
     GENmodel *genmodel;
     CKTcircuit *ckt;
-    register Ndata *data;
+    Ndata *data;
     double *OnDens;
 {
     MESmodel *firstModel = (MESmodel *) genmodel;
-    register MESmodel *model;
-    register MESinstance *inst;
+    MESmodel *model;
+    MESinstance *inst;
     char name[N_MXVLNTH];
     double tempOnoise;
     double tempInoise;
diff --git a/src/spicelib/devices/mes/mespzld.c b/src/spicelib/devices/mes/mespzld.c
index e9a3f917f..7ebe2175c 100644
--- a/src/spicelib/devices/mes/mespzld.c
+++ b/src/spicelib/devices/mes/mespzld.c
@@ -17,11 +17,11 @@ Author: 1985 S. Hwang
 int
 MESpzLoad(inModel,ckt,s)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     SPcomplex *s;
 {
-    register MESmodel *model = (MESmodel*)inModel;
-    register MESinstance *here;
+    MESmodel *model = (MESmodel*)inModel;
+    MESinstance *here;
     double gdpr;
     double gspr;
     double gm;
diff --git a/src/spicelib/devices/mes/messetup.c b/src/spicelib/devices/mes/messetup.c
index bf8c7c1e7..1c9fccf1c 100644
--- a/src/spicelib/devices/mes/messetup.c
+++ b/src/spicelib/devices/mes/messetup.c
@@ -14,7 +14,7 @@ Author: 1985 S. Hwang
 
 int
 MESsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
     CKTcircuit *ckt;
     int *states;
@@ -22,8 +22,8 @@ MESsetup(matrix,inModel,ckt,states)
          * for fast matrix loading 
          */
 {
-    register MESmodel *model = (MESmodel*)inModel;
-    register MESinstance *here;
+    MESmodel *model = (MESmodel*)inModel;
+    MESinstance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/mes/mestemp.c b/src/spicelib/devices/mes/mestemp.c
index c331e41d7..285eb32db 100644
--- a/src/spicelib/devices/mes/mestemp.c
+++ b/src/spicelib/devices/mes/mestemp.c
@@ -21,7 +21,7 @@ MEStemp(inModel,ckt)
          * for fast matrix loading 
          */
 {
-    register MESmodel *model = (MESmodel*)inModel;
+    MESmodel *model = (MESmodel*)inModel;
     double xfc, temp;
 
     /*  loop through all the diode models */
diff --git a/src/spicelib/devices/mes/mestrunc.c b/src/spicelib/devices/mes/mestrunc.c
index 6a3517f00..2f7ff8e97 100644
--- a/src/spicelib/devices/mes/mestrunc.c
+++ b/src/spicelib/devices/mes/mestrunc.c
@@ -16,11 +16,11 @@ Author: 1985 S. Hwang
 int
 MEStrunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 {
-    register MESmodel *model = (MESmodel*)inModel;
-    register MESinstance *here;
+    MESmodel *model = (MESmodel*)inModel;
+    MESinstance *here;
 
     for( ; model != NULL; model = model->MESnextModel) {
         for(here=model->MESinstances;here!=NULL;here = here->MESnextInstance){
diff --git a/src/spicelib/devices/mos1/mos1acld.c b/src/spicelib/devices/mos1/mos1acld.c
index 3299e7eeb..ba2053429 100644
--- a/src/spicelib/devices/mos1/mos1acld.c
+++ b/src/spicelib/devices/mos1/mos1acld.c
@@ -16,10 +16,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS1acLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS1model *model = (MOS1model*)inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model*)inModel;
+    MOS1instance *here;
     int xnrm;
     int xrev;
     double xgs;
diff --git a/src/spicelib/devices/mos1/mos1conv.c b/src/spicelib/devices/mos1/mos1conv.c
index 50d882744..d9b976579 100644
--- a/src/spicelib/devices/mos1/mos1conv.c
+++ b/src/spicelib/devices/mos1/mos1conv.c
@@ -13,10 +13,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS1convTest(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS1model *model = (MOS1model*)inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model*)inModel;
+    MOS1instance *here;
     double delvbs;
     double delvbd;
     double delvgs;
diff --git a/src/spicelib/devices/mos1/mos1dist.c b/src/spicelib/devices/mos1/mos1dist.c
index 615f9b62f..a0c884f54 100644
--- a/src/spicelib/devices/mos1/mos1dist.c
+++ b/src/spicelib/devices/mos1/mos1dist.c
@@ -14,7 +14,7 @@ Author: 1988 Jaijeet S Roychowdhury
 int
 MOS1disto(mode,genmodel,ckt)
  GENmodel *genmodel;
- register CKTcircuit *ckt;
+ CKTcircuit *ckt;
  int mode;
 
 /* assuming here that ckt->CKTomega has been initialised to 
@@ -40,7 +40,7 @@ MOS1disto(mode,genmodel,ckt)
  double r2h1m2y,i2h1m2y;
  double r2h1m2z, i2h1m2z;
  double temp, itemp;
- register MOS1instance *here;
+ MOS1instance *here;
 
 if (mode == D_SETUP)
  return(MOS1dSetup(model,ckt));
diff --git a/src/spicelib/devices/mos1/mos1dset.c b/src/spicelib/devices/mos1/mos1dset.c
index 89ced3ed3..e16c9f8d9 100644
--- a/src/spicelib/devices/mos1/mos1dset.c
+++ b/src/spicelib/devices/mos1/mos1dset.c
@@ -16,13 +16,13 @@ Author: 1988 Jaijeet S Roychowdhury
 int
 MOS1dSetup(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current value into the 
          * sparse matrix previously provided 
          */
 {
-    register MOS1model *model = (MOS1model *) inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model *) inModel;
+    MOS1instance *here;
     double Beta;
     double DrainSatCur;
     double EffectiveLength;
@@ -80,9 +80,6 @@ MOS1dSetup(inModel,ckt)
     double lcapbd2;
     double lcapbd3;
     double gmbds;
-#ifndef NOBYPASS
-#endif /*NOBYPASS*/
-
 
 
     /*  loop through all the MOS1 device models */
diff --git a/src/spicelib/devices/mos1/mos1load.c b/src/spicelib/devices/mos1/mos1load.c
index bdca66a70..8623f5fb4 100644
--- a/src/spicelib/devices/mos1/mos1load.c
+++ b/src/spicelib/devices/mos1/mos1load.c
@@ -16,13 +16,13 @@ Author: 1985 Thomas L. Quarles
 int
 MOS1load(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current value into the 
          * sparse matrix previously provided 
          */
 {
-    register MOS1model *model = (MOS1model *) inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model *) inModel;
+    MOS1instance *here;
     double Beta;
     double DrainSatCur;
     double EffectiveLength;
@@ -75,30 +75,17 @@ MOS1load(inModel,ckt)
     double capgd;   /* total gate-drain capacitance */
     double capgb;   /* total gate-bulk capacitance */
     int Check;
-#ifndef NOBYPASS
     double tempv;
-#endif /*NOBYPASS*/
     int error;
-#ifdef CAPBYPASS
-    int senflag;
-#endif /* CAPBYPASS */ 
     int SenCond;
 
 
-#ifdef CAPBYPASS
-    senflag = 0;
-    if(ckt->CKTsenInfo && ckt->CKTsenInfo->SENstatus == PERTURBATION &&
-        (ckt->CKTsenInfo->SENmode & (ACSEN | TRANSEN))) {
-        senflag = 1;
-    }
-#endif /* CAPBYPASS */ 
-
     /*  loop through all the MOS1 device models */
     for( ; model != NULL; model = model->MOS1nextModel ) {
 
         /* loop through all the instances of the model */
         for (here = model->MOS1instances; here != NULL ;
-                here=here->MOS1nextInstance) {
+	     here=here->MOS1nextInstance) {
 	    if (here->MOS1owner != ARCHme) continue;
 
             vt = CONSTKoverQ * here->MOS1temp;
@@ -109,20 +96,15 @@ MOS1load(inModel,ckt)
 #endif /* SENSDEBUG */
 
                 if((ckt->CKTsenInfo->SENstatus == PERTURBATION)&&
-                    (here->MOS1senPertFlag == OFF))continue;
+		   (here->MOS1senPertFlag == OFF))continue;
 
             }
             SenCond = ckt->CKTsenInfo && here->MOS1senPertFlag;
 
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mospta");
-asm("mospta:");
-#endif /*DETAILPROF*/
-
             /* first, we compute a few useful values - these could be
              * pre-computed, but for historical reasons are still done
              * here.  They may be moved at the expense of instance size
@@ -130,25 +112,25 @@ asm("mospta:");
 
             EffectiveLength=here->MOS1l - 2*model->MOS1latDiff;
             if( (here->MOS1tSatCurDens == 0) || 
-                    (here->MOS1drainArea == 0) ||
-                    (here->MOS1sourceArea == 0)) {
+		(here->MOS1drainArea == 0) ||
+		(here->MOS1sourceArea == 0)) {
                 DrainSatCur = here->MOS1tSatCur;
                 SourceSatCur = here->MOS1tSatCur;
             } else {
                 DrainSatCur = here->MOS1tSatCurDens * 
-                        here->MOS1drainArea;
+		    here->MOS1drainArea;
                 SourceSatCur = here->MOS1tSatCurDens * 
-                        here->MOS1sourceArea;
+		    here->MOS1sourceArea;
             }
             GateSourceOverlapCap = model->MOS1gateSourceOverlapCapFactor * 
-                    here->MOS1w;
+		here->MOS1w;
             GateDrainOverlapCap = model->MOS1gateDrainOverlapCapFactor * 
-                    here->MOS1w;
+		here->MOS1w;
             GateBulkOverlapCap = model->MOS1gateBulkOverlapCapFactor * 
-                    EffectiveLength;
+		EffectiveLength;
             Beta = here->MOS1tTransconductance * here->MOS1w/EffectiveLength;
             OxideCap = model->MOS1oxideCapFactor * EffectiveLength * 
-                    here->MOS1w;
+		here->MOS1w;
             /* 
              * ok - now to do the start-up operations
              *
@@ -164,7 +146,7 @@ asm("mospta:");
                 printf("MOS1senPertFlag = ON \n");
 #endif /* SENSDEBUG */
                 if((ckt->CKTsenInfo->SENmode == TRANSEN) &&
-                (ckt->CKTmode & MODEINITTRAN)) {
+		   (ckt->CKTmode & MODEINITTRAN)) {
                     vgs = *(ckt->CKTstate1 + here->MOS1vgs);
                     vds = *(ckt->CKTstate1 + here->MOS1vds);
                     vbs = *(ckt->CKTstate1 + here->MOS1vbs);
@@ -199,8 +181,8 @@ asm("mospta:");
 
 
             if((ckt->CKTmode & (MODEINITFLOAT | MODEINITPRED | MODEINITSMSIG
-                    | MODEINITTRAN)) ||
-                    ( (ckt->CKTmode & MODEINITFIX) && (!here->MOS1off) )  ) {
+				| MODEINITTRAN)) ||
+	       ( (ckt->CKTmode & MODEINITFIX) && (!here->MOS1off) )  ) {
 #ifndef PREDICTOR
                 if(ckt->CKTmode & (MODEINITPRED | MODEINITTRAN) ) {
 
@@ -208,20 +190,20 @@ asm("mospta:");
 
                     xfact=ckt->CKTdelta/ckt->CKTdeltaOld[1];
                     *(ckt->CKTstate0 + here->MOS1vbs) = 
-                            *(ckt->CKTstate1 + here->MOS1vbs);
+			*(ckt->CKTstate1 + here->MOS1vbs);
                     vbs = (1+xfact)* (*(ckt->CKTstate1 + here->MOS1vbs))
-                            -(xfact * (*(ckt->CKTstate2 + here->MOS1vbs)));
+			-(xfact * (*(ckt->CKTstate2 + here->MOS1vbs)));
                     *(ckt->CKTstate0 + here->MOS1vgs) = 
-                            *(ckt->CKTstate1 + here->MOS1vgs);
+			*(ckt->CKTstate1 + here->MOS1vgs);
                     vgs = (1+xfact)* (*(ckt->CKTstate1 + here->MOS1vgs))
-                            -(xfact * (*(ckt->CKTstate2 + here->MOS1vgs)));
+			-(xfact * (*(ckt->CKTstate2 + here->MOS1vgs)));
                     *(ckt->CKTstate0 + here->MOS1vds) = 
-                            *(ckt->CKTstate1 + here->MOS1vds);
+			*(ckt->CKTstate1 + here->MOS1vds);
                     vds = (1+xfact)* (*(ckt->CKTstate1 + here->MOS1vds))
-                            -(xfact * (*(ckt->CKTstate2 + here->MOS1vds)));
+			-(xfact * (*(ckt->CKTstate2 + here->MOS1vds)));
                     *(ckt->CKTstate0 + here->MOS1vbd) = 
-                            *(ckt->CKTstate0 + here->MOS1vbs)-
-                            *(ckt->CKTstate0 + here->MOS1vds);
+			*(ckt->CKTstate0 + here->MOS1vbs)-
+			*(ckt->CKTstate0 + here->MOS1vds);
                 } else {
 #endif /* PREDICTOR */
 
@@ -245,7 +227,7 @@ asm("mospta:");
                 vbd=vbs-vds;
                 vgd=vgs-vds;
                 vgdo = *(ckt->CKTstate0 + here->MOS1vgs) - 
-                        *(ckt->CKTstate0 + here->MOS1vds);
+		    *(ckt->CKTstate0 + here->MOS1vds);
                 delvbs = vbs - *(ckt->CKTstate0 + here->MOS1vbs);
                 delvbd = vbd - *(ckt->CKTstate0 + here->MOS1vbd);
                 delvgs = vgs - *(ckt->CKTstate0 + here->MOS1vgs);
@@ -265,7 +247,7 @@ asm("mospta:");
                     cdhat=
                         here->MOS1cd -
                         ( here->MOS1gbd -
-                        here->MOS1gmbs) * delvbd -
+			  here->MOS1gmbs) * delvbd -
                         here->MOS1gm * delvgd + 
                         here->MOS1gds * delvds ;
                 }
@@ -275,82 +257,79 @@ asm("mospta:");
                     here->MOS1gbd * delvbd +
                     here->MOS1gbs * delvbs ;
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptb");
-asm("mosptb:");
-#endif /*DETAILPROF*/
-#ifndef NOBYPASS
                 /* now lets see if we can bypass (ugh) */
-                /* the following mess should be one if statement, but
-                 * many compilers can't handle it all at once, so it
-                 * is split into several successive if statements
-                 */
-                tempv = MAX(fabs(cbhat),fabs(here->MOS1cbs
-                        + here->MOS1cbd))+ckt->CKTabstol;
-                if((!(ckt->CKTmode & (MODEINITPRED|MODEINITTRAN|MODEINITSMSIG)
-                        )) && (ckt->CKTbypass) )
-                if ( (fabs(cbhat-(here->MOS1cbs + 
-                        here->MOS1cbd)) < ckt->CKTreltol * 
-                        tempv)) 
-                if( (fabs(delvbs) < (ckt->CKTreltol * MAX(fabs(vbs),
-                        fabs(*(ckt->CKTstate0+here->MOS1vbs)))+
-                        ckt->CKTvoltTol)))
-                if ( (fabs(delvbd) < (ckt->CKTreltol * MAX(fabs(vbd),
-                        fabs(*(ckt->CKTstate0+here->MOS1vbd)))+
-                        ckt->CKTvoltTol)) )
-                if( (fabs(delvgs) < (ckt->CKTreltol * MAX(fabs(vgs),
-                        fabs(*(ckt->CKTstate0+here->MOS1vgs)))+
-                        ckt->CKTvoltTol)))
-                if ( (fabs(delvds) < (ckt->CKTreltol * MAX(fabs(vds),
-                        fabs(*(ckt->CKTstate0+here->MOS1vds)))+
-                        ckt->CKTvoltTol)) )
-                if( (fabs(cdhat- here->MOS1cd) <
-                        ckt->CKTreltol * MAX(fabs(cdhat),fabs(
-                        here->MOS1cd)) + ckt->CKTabstol) ) {
+                tempv = (MAX(fabs(cbhat),
+			    fabs(here->MOS1cbs + here->MOS1cbd)) +
+			 ckt->CKTabstol);
+                if ((!(ckt->CKTmode &
+		       (MODEINITPRED|MODEINITTRAN|MODEINITSMSIG))) &&
+		    (ckt->CKTbypass) &&
+		    (fabs(cbhat-(here->MOS1cbs + 
+				 here->MOS1cbd)) < ckt->CKTreltol * tempv) &&
+		    (fabs(delvbs) < (ckt->CKTreltol *
+				     MAX(fabs(vbs),
+					 fabs( *(ckt->CKTstate0 +
+						 here->MOS1vbs))) +
+				     ckt->CKTvoltTol)) &&
+		    (fabs(delvbd) < (ckt->CKTreltol *
+				     MAX(fabs(vbd),
+					 fabs(*(ckt->CKTstate0 +
+						here->MOS1vbd))) +
+				     ckt->CKTvoltTol)) &&
+		    (fabs(delvgs) < (ckt->CKTreltol *
+				     MAX(fabs(vgs),
+					 fabs(*(ckt->CKTstate0 +
+						here->MOS1vgs)))+
+				     ckt->CKTvoltTol)) &&
+		    (fabs(delvds) < (ckt->CKTreltol *
+				     MAX(fabs(vds),
+					 fabs(*(ckt->CKTstate0 +
+						here->MOS1vds))) +
+				     ckt->CKTvoltTol)) &&
+		    (fabs(cdhat- here->MOS1cd) < (ckt->CKTreltol *
+						  MAX(fabs(cdhat),
+						      fabs(here->MOS1cd)) +
+						  ckt->CKTabstol))) {
 		  /* bypass code */
-                    /* nothing interesting has changed since last
-                     * iteration on this device, so we just
-                     * copy all the values computed last iteration out
-                     * and keep going
-                     */
-                    vbs = *(ckt->CKTstate0 + here->MOS1vbs);
-                    vbd = *(ckt->CKTstate0 + here->MOS1vbd);
-                    vgs = *(ckt->CKTstate0 + here->MOS1vgs);
-                    vds = *(ckt->CKTstate0 + here->MOS1vds);
-                    vgd = vgs - vds;
-                    vgb = vgs - vbs;
-                    cdrain = here->MOS1mode * (here->MOS1cd + here->MOS1cbd);
-                    if(ckt->CKTmode & (MODETRAN | MODETRANOP)) {
-                        capgs = ( *(ckt->CKTstate0+here->MOS1capgs)+ 
-                                  *(ckt->CKTstate1+here->MOS1capgs) +
-                                  GateSourceOverlapCap );
-                        capgd = ( *(ckt->CKTstate0+here->MOS1capgd)+ 
-                                  *(ckt->CKTstate1+here->MOS1capgd) +
-                                  GateDrainOverlapCap );
-                        capgb = ( *(ckt->CKTstate0+here->MOS1capgb)+ 
-                                  *(ckt->CKTstate1+here->MOS1capgb) +
-                                  GateBulkOverlapCap );
+		  /* nothing interesting has changed since last
+		   * iteration on this device, so we just
+		   * copy all the values computed last iteration out
+		   * and keep going
+		   */
+		  vbs = *(ckt->CKTstate0 + here->MOS1vbs);
+		  vbd = *(ckt->CKTstate0 + here->MOS1vbd);
+		  vgs = *(ckt->CKTstate0 + here->MOS1vgs);
+		  vds = *(ckt->CKTstate0 + here->MOS1vds);
+		  vgd = vgs - vds;
+		  vgb = vgs - vbs;
+		  cdrain = here->MOS1mode * (here->MOS1cd + here->MOS1cbd);
+		  if(ckt->CKTmode & (MODETRAN | MODETRANOP)) {
+		    capgs = ( *(ckt->CKTstate0+here->MOS1capgs)+ 
+			      *(ckt->CKTstate1+here->MOS1capgs) +
+			      GateSourceOverlapCap );
+		    capgd = ( *(ckt->CKTstate0+here->MOS1capgd)+ 
+			      *(ckt->CKTstate1+here->MOS1capgd) +
+			      GateDrainOverlapCap );
+		    capgb = ( *(ckt->CKTstate0+here->MOS1capgb)+ 
+			      *(ckt->CKTstate1+here->MOS1capgb) +
+			      GateBulkOverlapCap );
+		    
+		    if(ckt->CKTsenInfo){
+		      here->MOS1cgs = capgs;
+		      here->MOS1cgd = capgd;
+		      here->MOS1cgb = capgb;
+		    }
+		  }
+		  goto bypass;
+		}
 
-                        if(ckt->CKTsenInfo){
-                            here->MOS1cgs = capgs;
-                            here->MOS1cgd = capgd;
-                            here->MOS1cgb = capgb;
-                        }
-                    }
-                    goto bypass;
-                }
-#endif /*NOBYPASS*/
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptc");
-asm("mosptc:");
-#endif /*DETAILPROF*/
                 /* ok - bypass is out, do it the hard way */
 
                 von = model->MOS1type * here->MOS1von;
@@ -365,7 +344,7 @@ asm("mosptc:");
 
                 if(*(ckt->CKTstate0 + here->MOS1vds) >=0) {
                     vgs = DEVfetlim(vgs,*(ckt->CKTstate0 + here->MOS1vgs)
-                            ,von);
+				    ,von);
                     vds = vgs - vgd;
                     vds = DEVlimvds(vds,*(ckt->CKTstate0 + here->MOS1vds));
                     vgd = vgs - vds;
@@ -374,28 +353,24 @@ asm("mosptc:");
                     vds = vgs - vgd;
                     if(!(ckt->CKTfixLimit)) {
                         vds = -DEVlimvds(-vds,-(*(ckt->CKTstate0 + 
-                                here->MOS1vds)));
+						  here->MOS1vds)));
                     }
                     vgs = vgd + vds;
                 }
                 if(vds >= 0) {
                     vbs = DEVpnjlim(vbs,*(ckt->CKTstate0 + here->MOS1vbs),
-                            vt,here->MOS1sourceVcrit,&Check);
+				    vt,here->MOS1sourceVcrit,&Check);
                     vbd = vbs-vds;
                 } else {
                     vbd = DEVpnjlim(vbd,*(ckt->CKTstate0 + here->MOS1vbd),
-                            vt,here->MOS1drainVcrit,&Check);
+				    vt,here->MOS1drainVcrit,&Check);
                     vbs = vbd + vds;
                 }
 #endif /*NODELIMITING*/
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptd");
-asm("mosptd:");
-#endif /*DETAILPROF*/
             } else {
 
                 /* ok - not one of the simple cases, so we have to
@@ -408,9 +383,9 @@ asm("mosptd:");
                     vgs= model->MOS1type * here->MOS1icVGS;
                     vbs= model->MOS1type * here->MOS1icVBS;
                     if((vds==0) && (vgs==0) && (vbs==0) && 
-                            ((ckt->CKTmode & 
-                                (MODETRAN|MODEDCOP|MODEDCTRANCURVE)) ||
-                             (!(ckt->CKTmode & MODEUIC)))) {
+		       ((ckt->CKTmode & 
+			 (MODETRAN|MODEDCOP|MODEDCTRANCURVE)) ||
+			(!(ckt->CKTmode & MODEUIC)))) {
                         vbs = -1;
                         vgs = model->MOS1type * here->MOS1tVto;
                         vds = 0;
@@ -420,14 +395,9 @@ asm("mosptd:");
                 } 
             }
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mospte");
-asm("mospte:");
-#endif /*DETAILPROF*/
-
             /*
              * now all the preliminaries are over - we can start doing the
              * real work
@@ -442,15 +412,15 @@ asm("mospte:");
              *   here we just evaluate the ideal diode current and the
              *   corresponding derivative (conductance).
              */
-next1:      if(vbs <= 0) {
-                here->MOS1gbs = SourceSatCur/vt;
-                here->MOS1cbs = here->MOS1gbs*vbs;
-                here->MOS1gbs += ckt->CKTgmin;
-            } else {
-                evbs = exp(MIN(MAX_EXP_ARG,vbs/vt));
-                here->MOS1gbs = SourceSatCur*evbs/vt + ckt->CKTgmin;
-                here->MOS1cbs = SourceSatCur * (evbs-1);
-            }
+	next1:      if(vbs <= 0) {
+	    here->MOS1gbs = SourceSatCur/vt;
+	    here->MOS1cbs = here->MOS1gbs*vbs;
+	    here->MOS1gbs += ckt->CKTgmin;
+	} else {
+	    evbs = exp(MIN(MAX_EXP_ARG,vbs/vt));
+	    here->MOS1gbs = SourceSatCur*evbs/vt + ckt->CKTgmin;
+	    here->MOS1cbs = SourceSatCur * (evbs-1);
+	}
             if(vbd <= 0) {
                 here->MOS1gbd = DrainSatCur/vt;
                 here->MOS1cbd = here->MOS1gbd *vbd;
@@ -472,29 +442,25 @@ next1:      if(vbs <= 0) {
                 here->MOS1mode = -1;
             }
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptf");
-asm("mosptf:");
-#endif /*DETAILPROF*/
             {
-            /*
-             *     this block of code evaluates the drain current and its 
-             *     derivatives using the shichman-hodges model and the 
-             *     charges associated with the gate, channel and bulk for 
-             *     mosfets
-             *
-             */
+		/*
+		 *     this block of code evaluates the drain current and its 
+		 *     derivatives using the shichman-hodges model and the 
+		 *     charges associated with the gate, channel and bulk for 
+		 *     mosfets
+		 *
+		 */
 
-            /* the following 4 variables are local to this code block until 
-             * it is obvious that they can be made global 
-             */
-            double arg;
-            double betap;
-            double sarg;
-            double vgst;
+		/* the following 4 variables are local to this code block until 
+		 * it is obvious that they can be made global 
+		 */
+		double arg;
+		double betap;
+		double sarg;
+		double vgst;
 
                 if ((here->MOS1mode==1?vbs:vbd) <= 0 ) {
                     sarg=sqrt(here->MOS1tPhi-(here->MOS1mode==1?vbs:vbd));
@@ -530,16 +496,16 @@ asm("mosptf:");
                         here->MOS1gds=model->MOS1lambda*Beta*vgst*vgst*.5;
                         here->MOS1gmbs=here->MOS1gm*arg;
                     } else {
-                    /*
-                     *     linear region
-                     */
+			/*
+			 *     linear region
+			 */
                         cdrain=betap*(vds*here->MOS1mode)*
                             (vgst-.5*(vds*here->MOS1mode));
                         here->MOS1gm=betap*(vds*here->MOS1mode);
                         here->MOS1gds=betap*(vgst-(vds*here->MOS1mode))+
-                                model->MOS1lambda*Beta*
-                                (vds*here->MOS1mode)*
-                                (vgst-.5*(vds*here->MOS1mode));
+			    model->MOS1lambda*Beta*
+			    (vds*here->MOS1mode)*
+			    (vgst-.5*(vds*here->MOS1mode));
                         here->MOS1gmbs=here->MOS1gm*arg;
                     }
                 }
@@ -548,14 +514,9 @@ asm("mosptf:");
                  */
             }
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptg");
-asm("mosptg:");
-#endif /*DETAILPROF*/
-
             /* now deal with n vs p polarity */
 
             here->MOS1von = model->MOS1type * von;
@@ -581,152 +542,127 @@ asm("mosptg:");
                  *
                  *.. bulk-drain and bulk-source depletion capacitances
                  */
-#ifdef CAPBYPASS
-                if(((ckt->CKTmode & (MODEINITPRED | MODEINITTRAN) ) ||
-                        fabs(delvbs) >= ckt->CKTreltol * MAX(fabs(vbs),
-                        fabs(*(ckt->CKTstate0+here->MOS1vbs)))+
-                        ckt->CKTvoltTol)|| senflag)
-#endif /*CAPBYPASS*/
                 {
                     /* can't bypass the diode capacitance calculations */
-#ifdef CAPZEROBYPASS
                     if(here->MOS1Cbs != 0 || here->MOS1Cbssw != 0 ) {
-#endif /*CAPZEROBYPASS*/
-                    if (vbs < here->MOS1tDepCap){
-                        arg=1-vbs/here->MOS1tBulkPot;
-                        /*
-                         * the following block looks somewhat long and messy,
-                         * but since most users use the default grading
-                         * coefficients of .5, and sqrt is MUCH faster than an
-                         * exp(log()) we use this special case code to buy time.
-                         * (as much as 10% of total job time!)
-                         */
+			if (vbs < here->MOS1tDepCap){
+			    arg=1-vbs/here->MOS1tBulkPot;
+			    /*
+			     * the following block looks somewhat long and messy,
+			     * but since most users use the default grading
+			     * coefficients of .5, and sqrt is MUCH faster than an
+			     * exp(log()) we use this special case code to buy time.
+			     * (as much as 10% of total job time!)
+			     */
 #ifndef NOSQRT
-                        if(model->MOS1bulkJctBotGradingCoeff ==
-                                model->MOS1bulkJctSideGradingCoeff) {
-                            if(model->MOS1bulkJctBotGradingCoeff == .5) {
-                                sarg = sargsw = 1/sqrt(arg);
-                            } else {
-                                sarg = sargsw =
+			    if(model->MOS1bulkJctBotGradingCoeff ==
+			       model->MOS1bulkJctSideGradingCoeff) {
+				if(model->MOS1bulkJctBotGradingCoeff == .5) {
+				    sarg = sargsw = 1/sqrt(arg);
+				} else {
+				    sarg = sargsw =
                                         exp(-model->MOS1bulkJctBotGradingCoeff*
-                                        log(arg));
-                            }
-                        } else {
-                            if(model->MOS1bulkJctBotGradingCoeff == .5) {
-                                sarg = 1/sqrt(arg);
-                            } else {
+					    log(arg));
+				}
+			    } else {
+				if(model->MOS1bulkJctBotGradingCoeff == .5) {
+				    sarg = 1/sqrt(arg);
+				} else {
 #endif /*NOSQRT*/
-                                sarg = exp(-model->MOS1bulkJctBotGradingCoeff*
-                                        log(arg));
+				    sarg = exp(-model->MOS1bulkJctBotGradingCoeff*
+					       log(arg));
 #ifndef NOSQRT
-                            }
-                            if(model->MOS1bulkJctSideGradingCoeff == .5) {
-                                sargsw = 1/sqrt(arg);
-                            } else {
+				}
+				if(model->MOS1bulkJctSideGradingCoeff == .5) {
+				    sargsw = 1/sqrt(arg);
+				} else {
 #endif /*NOSQRT*/
-                                sargsw =exp(-model->MOS1bulkJctSideGradingCoeff*
-                                        log(arg));
+				    sargsw =exp(-model->MOS1bulkJctSideGradingCoeff*
+						log(arg));
 #ifndef NOSQRT
-                            }
-                        }
+				}
+			    }
 #endif /*NOSQRT*/
-                        *(ckt->CKTstate0 + here->MOS1qbs) =
-                            here->MOS1tBulkPot*(here->MOS1Cbs*
-                            (1-arg*sarg)/(1-model->MOS1bulkJctBotGradingCoeff)
-                            +here->MOS1Cbssw*
-                            (1-arg*sargsw)/
-                            (1-model->MOS1bulkJctSideGradingCoeff));
-                        here->MOS1capbs=here->MOS1Cbs*sarg+
+			    *(ckt->CKTstate0 + here->MOS1qbs) =
+				here->MOS1tBulkPot*(here->MOS1Cbs*
+						    (1-arg*sarg)/(1-model->MOS1bulkJctBotGradingCoeff)
+						    +here->MOS1Cbssw*
+						    (1-arg*sargsw)/
+						    (1-model->MOS1bulkJctSideGradingCoeff));
+			    here->MOS1capbs=here->MOS1Cbs*sarg+
                                 here->MOS1Cbssw*sargsw;
-                    } else {
-                        *(ckt->CKTstate0 + here->MOS1qbs) = here->MOS1f4s +
+			} else {
+			    *(ckt->CKTstate0 + here->MOS1qbs) = here->MOS1f4s +
                                 vbs*(here->MOS1f2s+vbs*(here->MOS1f3s/2));
-                        here->MOS1capbs=here->MOS1f2s+here->MOS1f3s*vbs;
-                    }
-#ifdef CAPZEROBYPASS
+			    here->MOS1capbs=here->MOS1f2s+here->MOS1f3s*vbs;
+			}
                     } else {
-                        *(ckt->CKTstate0 + here->MOS1qbs) = 0;
+			*(ckt->CKTstate0 + here->MOS1qbs) = 0;
                         here->MOS1capbs=0;
                     }
-#endif /*CAPZEROBYPASS*/
                 }
-#ifdef CAPBYPASS
-                if(((ckt->CKTmode & (MODEINITPRED | MODEINITTRAN) ) ||
-                        fabs(delvbd) >= ckt->CKTreltol * MAX(fabs(vbd),
-                        fabs(*(ckt->CKTstate0+here->MOS1vbd)))+
-                        ckt->CKTvoltTol)|| senflag)
-#endif /*CAPBYPASS*/
                     /* can't bypass the diode capacitance calculations */
                 {
-#ifdef CAPZEROBYPASS
                     if(here->MOS1Cbd != 0 || here->MOS1Cbdsw != 0 ) {
-#endif /*CAPZEROBYPASS*/
-                    if (vbd < here->MOS1tDepCap) {
-                        arg=1-vbd/here->MOS1tBulkPot;
-                        /*
-                         * the following block looks somewhat long and messy,
-                         * but since most users use the default grading
-                         * coefficients of .5, and sqrt is MUCH faster than an
-                         * exp(log()) we use this special case code to buy time.
-                         * (as much as 10% of total job time!)
-                         */
+			if (vbd < here->MOS1tDepCap) {
+			    arg=1-vbd/here->MOS1tBulkPot;
+			    /*
+			     * the following block looks somewhat long and messy,
+			     * but since most users use the default grading
+			     * coefficients of .5, and sqrt is MUCH faster than an
+			     * exp(log()) we use this special case code to buy time.
+			     * (as much as 10% of total job time!)
+			     */
 #ifndef NOSQRT
-                        if(model->MOS1bulkJctBotGradingCoeff == .5 &&
-                                model->MOS1bulkJctSideGradingCoeff == .5) {
-                            sarg = sargsw = 1/sqrt(arg);
-                        } else {
-                            if(model->MOS1bulkJctBotGradingCoeff == .5) {
-                                sarg = 1/sqrt(arg);
-                            } else {
+			    if(model->MOS1bulkJctBotGradingCoeff == .5 &&
+			       model->MOS1bulkJctSideGradingCoeff == .5) {
+				sarg = sargsw = 1/sqrt(arg);
+			    } else {
+				if(model->MOS1bulkJctBotGradingCoeff == .5) {
+				    sarg = 1/sqrt(arg);
+				} else {
 #endif /*NOSQRT*/
-                                sarg = exp(-model->MOS1bulkJctBotGradingCoeff*
-                                        log(arg));
+				    sarg = exp(-model->MOS1bulkJctBotGradingCoeff*
+					       log(arg));
 #ifndef NOSQRT
-                            }
-                            if(model->MOS1bulkJctSideGradingCoeff == .5) {
-                                sargsw = 1/sqrt(arg);
-                            } else {
+				}
+				if(model->MOS1bulkJctSideGradingCoeff == .5) {
+				    sargsw = 1/sqrt(arg);
+				} else {
 #endif /*NOSQRT*/
-                                sargsw =exp(-model->MOS1bulkJctSideGradingCoeff*
-                                        log(arg));
+				    sargsw =exp(-model->MOS1bulkJctSideGradingCoeff*
+						log(arg));
 #ifndef NOSQRT
-                            }
-                        }
+				}
+			    }
 #endif /*NOSQRT*/
-                        *(ckt->CKTstate0 + here->MOS1qbd) =
-                            here->MOS1tBulkPot*(here->MOS1Cbd*
-                            (1-arg*sarg)
-                            /(1-model->MOS1bulkJctBotGradingCoeff)
-                            +here->MOS1Cbdsw*
-                            (1-arg*sargsw)
-                            /(1-model->MOS1bulkJctSideGradingCoeff));
-                        here->MOS1capbd=here->MOS1Cbd*sarg+
+			    *(ckt->CKTstate0 + here->MOS1qbd) =
+				here->MOS1tBulkPot*(here->MOS1Cbd*
+						    (1-arg*sarg)
+						    /(1-model->MOS1bulkJctBotGradingCoeff)
+						    +here->MOS1Cbdsw*
+						    (1-arg*sargsw)
+						    /(1-model->MOS1bulkJctSideGradingCoeff));
+			    here->MOS1capbd=here->MOS1Cbd*sarg+
                                 here->MOS1Cbdsw*sargsw;
-                    } else {
-                        *(ckt->CKTstate0 + here->MOS1qbd) = here->MOS1f4d +
+			} else {
+			    *(ckt->CKTstate0 + here->MOS1qbd) = here->MOS1f4d +
                                 vbd * (here->MOS1f2d + vbd * here->MOS1f3d/2);
-                        here->MOS1capbd=here->MOS1f2d + vbd * here->MOS1f3d;
-                    }
-#ifdef CAPZEROBYPASS
-                } else {
-                    *(ckt->CKTstate0 + here->MOS1qbd) = 0;
-                    here->MOS1capbd = 0;
-                }
-#endif /*CAPZEROBYPASS*/
+			    here->MOS1capbd=here->MOS1f2d + vbd * here->MOS1f3d;
+			}
+		    } else {
+			*(ckt->CKTstate0 + here->MOS1qbd) = 0;
+			here->MOS1capbd = 0;
+		    }
                 }
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mospth");
-asm("mospth:");
-#endif /*DETAILPROF*/
-
                 if(SenCond && (ckt->CKTsenInfo->SENmode==TRANSEN)) goto next2;
 
                 if ( (ckt->CKTmode & MODETRAN) || ( (ckt->CKTmode&MODEINITTRAN)
-						&& !(ckt->CKTmode&MODEUIC)) ) {
+						    && !(ckt->CKTmode&MODEUIC)) ) {
                     /* (above only excludes tranop, since we're only at this
                      * point if tran or tranop )
                      */
@@ -739,27 +675,22 @@ asm("mospth:");
                     /* integrate the capacitors and save results */
 
                     error = NIintegrate(ckt,&geq,&ceq,here->MOS1capbd,
-                            here->MOS1qbd);
+					here->MOS1qbd);
                     if(error) return(error);
                     here->MOS1gbd += geq;
                     here->MOS1cbd += *(ckt->CKTstate0 + here->MOS1cqbd);
                     here->MOS1cd -= *(ckt->CKTstate0 + here->MOS1cqbd);
                     error = NIintegrate(ckt,&geq,&ceq,here->MOS1capbs,
-                            here->MOS1qbs);
+					here->MOS1qbs);
                     if(error) return(error);
                     here->MOS1gbs += geq;
                     here->MOS1cbs += *(ckt->CKTstate0 + here->MOS1cqbs);
                 }
             }
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mospti");
-asm("mospti:");
-#endif /*DETAILPROF*/
-
             if(SenCond) goto next2;
 
 
@@ -767,53 +698,27 @@ asm("mospti:");
              *  check convergence
              */
             if ( (here->MOS1off == 0)  || 
-                    (!(ckt->CKTmode & (MODEINITFIX|MODEINITSMSIG))) ){
+		 (!(ckt->CKTmode & (MODEINITFIX|MODEINITSMSIG))) ){
                 if (Check == 1) {
                     ckt->CKTnoncon++;
 		    ckt->CKTtroubleElt = (GENinstance *) here;
-#ifndef NEWCONV
-                } else {
-                    tol=ckt->CKTreltol*MAX(fabs(cdhat),
-                            fabs(here->MOS1cd))+ckt->CKTabstol;
-                    if (fabs(cdhat-here->MOS1cd) >= tol) { 
-                        ckt->CKTnoncon++;
-			ckt->CKTtroubleElt = (GENinstance *) here;
-                    } else {
-                        tol=ckt->CKTreltol*MAX(fabs(cbhat),
-                                fabs(here->MOS1cbs+here->MOS1cbd))+
-                                ckt->CKTabstol;
-                        if (fabs(cbhat-(here->MOS1cbs+here->MOS1cbd)) > tol) {
-                            ckt->CKTnoncon++;
-			    ckt->CKTtroubleElt = (GENinstance *) here;
-                        }
-                    }
-#endif /*NEWCONV*/
                 }
             }
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptj");
-asm("mosptj:");
-#endif /*DETAILPROF*/
-
             /* save things away for next time */
 
-next2:      *(ckt->CKTstate0 + here->MOS1vbs) = vbs;
+	next2:      *(ckt->CKTstate0 + here->MOS1vbs) = vbs;
             *(ckt->CKTstate0 + here->MOS1vbd) = vbd;
             *(ckt->CKTstate0 + here->MOS1vgs) = vgs;
             *(ckt->CKTstate0 + here->MOS1vds) = vds;
 
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptk");
-asm("mosptk:");
-#endif /*DETAILPROF*/
             /*
              *     meyer's capacitor model
              */
@@ -830,27 +735,27 @@ asm("mosptk:");
                  */
                 if (here->MOS1mode > 0){
                     DEVqmeyer (vgs,vgd,vgb,von,vdsat,
-                        (ckt->CKTstate0 + here->MOS1capgs),
-                        (ckt->CKTstate0 + here->MOS1capgd),
-                        (ckt->CKTstate0 + here->MOS1capgb),
-                        here->MOS1tPhi,OxideCap);
+			       (ckt->CKTstate0 + here->MOS1capgs),
+			       (ckt->CKTstate0 + here->MOS1capgd),
+			       (ckt->CKTstate0 + here->MOS1capgb),
+			       here->MOS1tPhi,OxideCap);
                 } else {
                     DEVqmeyer (vgd,vgs,vgb,von,vdsat,
-                        (ckt->CKTstate0 + here->MOS1capgd),
-                        (ckt->CKTstate0 + here->MOS1capgs),
-                        (ckt->CKTstate0 + here->MOS1capgb),
-                        here->MOS1tPhi,OxideCap);
+			       (ckt->CKTstate0 + here->MOS1capgd),
+			       (ckt->CKTstate0 + here->MOS1capgs),
+			       (ckt->CKTstate0 + here->MOS1capgb),
+			       here->MOS1tPhi,OxideCap);
                 }
                 vgs1 = *(ckt->CKTstate1 + here->MOS1vgs);
                 vgd1 = vgs1 - *(ckt->CKTstate1 + here->MOS1vds);
                 vgb1 = vgs1 - *(ckt->CKTstate1 + here->MOS1vbs);
                 if(ckt->CKTmode & (MODETRANOP|MODEINITSMSIG)) {
                     capgs =  2 * *(ckt->CKTstate0+here->MOS1capgs)+ 
-                              GateSourceOverlapCap ;
+			GateSourceOverlapCap ;
                     capgd =  2 * *(ckt->CKTstate0+here->MOS1capgd)+ 
-                              GateDrainOverlapCap ;
+			GateDrainOverlapCap ;
                     capgb =  2 * *(ckt->CKTstate0+here->MOS1capgb)+ 
-                              GateBulkOverlapCap ;
+			GateBulkOverlapCap ;
                 } else {
                     capgs = ( *(ckt->CKTstate0+here->MOS1capgs)+ 
                               *(ckt->CKTstate1+here->MOS1capgs) +
@@ -868,20 +773,16 @@ asm("mosptk:");
                     here->MOS1cgb = capgb;
                 }
 /*
-
+  
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptl");
-asm("mosptl:");
-#endif /*DETAILPROF*/
                 /*
                  *     store small-signal parameters (for meyer's model)
                  *  all parameters already stored, so done...
                  */
                 if(SenCond){
                     if((ckt->CKTsenInfo->SENmode == DCSEN)||
-                            (ckt->CKTsenInfo->SENmode == ACSEN)){
+		       (ckt->CKTsenInfo->SENmode == ACSEN)){
                         continue;
                     }
                 }
@@ -916,11 +817,11 @@ asm("mosptl:");
                 }
 #endif /*PREDICTOR*/
             }
-bypass:
+	bypass:
             if(SenCond) continue;
 
             if ( (ckt->CKTmode & (MODEINITTRAN)) || 
-                    (! (ckt->CKTmode & (MODETRAN)) )  ) {
+		 (! (ckt->CKTmode & (MODETRAN)) )  ) {
                 /*
                  *  initialize to zero charge conductances 
                  *  and current
@@ -946,11 +847,11 @@ bypass:
                 error = NIintegrate(ckt,&gcgb,&ceqgb,capgb,here->MOS1qgb);
                 if(error) return(error);
                 ceqgs=ceqgs-gcgs*vgs+ckt->CKTag[0]* 
-                        *(ckt->CKTstate0 + here->MOS1qgs);
+		    *(ckt->CKTstate0 + here->MOS1qgs);
                 ceqgd=ceqgd-gcgd*vgd+ckt->CKTag[0]*
-                        *(ckt->CKTstate0 + here->MOS1qgd);
+		    *(ckt->CKTstate0 + here->MOS1qgd);
                 ceqgb=ceqgb-gcgb*vgb+ckt->CKTag[0]*
-                        *(ckt->CKTstate0 + here->MOS1qgb);
+		    *(ckt->CKTstate0 + here->MOS1qgb);
             }
             /*
              *     store charge storage info for meyer's cap in lx table
@@ -960,28 +861,28 @@ bypass:
              *  load current vector
              */
             ceqbs = model->MOS1type * 
-                    (here->MOS1cbs-(here->MOS1gbs-ckt->CKTgmin)*vbs);
+		(here->MOS1cbs-(here->MOS1gbs-ckt->CKTgmin)*vbs);
             ceqbd = model->MOS1type * 
-                    (here->MOS1cbd-(here->MOS1gbd-ckt->CKTgmin)*vbd);
+		(here->MOS1cbd-(here->MOS1gbd-ckt->CKTgmin)*vbd);
             if (here->MOS1mode >= 0) {
                 xnrm=1;
                 xrev=0;
                 cdreq=model->MOS1type*(cdrain-here->MOS1gds*vds-
-                        here->MOS1gm*vgs-here->MOS1gmbs*vbs);
+				       here->MOS1gm*vgs-here->MOS1gmbs*vbs);
             } else {
                 xnrm=0;
                 xrev=1;
                 cdreq = -(model->MOS1type)*(cdrain-here->MOS1gds*(-vds)-
-                        here->MOS1gm*vgd-here->MOS1gmbs*vbd);
+					    here->MOS1gm*vgd-here->MOS1gmbs*vbd);
             }
             *(ckt->CKTrhs + here->MOS1gNode) -= 
                 (model->MOS1type * (ceqgs + ceqgb + ceqgd));
             *(ckt->CKTrhs + here->MOS1bNode) -=
                 (ceqbs + ceqbd - model->MOS1type * ceqgb);
             *(ckt->CKTrhs + here->MOS1dNodePrime) +=
-                    (ceqbd - cdreq + model->MOS1type * ceqgd);
+		(ceqbd - cdreq + model->MOS1type * ceqgd);
             *(ckt->CKTrhs + here->MOS1sNodePrime) += 
-                    cdreq + ceqbs + model->MOS1type * ceqgs;
+		cdreq + ceqbs + model->MOS1type * ceqgs;
             /*
              *  load y matrix
              */
@@ -991,11 +892,11 @@ bypass:
             *(here->MOS1SsPtr) += (here->MOS1sourceConductance);
             *(here->MOS1BbPtr) += (here->MOS1gbd+here->MOS1gbs+gcgb);
             *(here->MOS1DPdpPtr) += 
-                    (here->MOS1drainConductance+here->MOS1gds+
-                    here->MOS1gbd+xrev*(here->MOS1gm+here->MOS1gmbs)+gcgd);
+		(here->MOS1drainConductance+here->MOS1gds+
+		 here->MOS1gbd+xrev*(here->MOS1gm+here->MOS1gmbs)+gcgd);
             *(here->MOS1SPspPtr) += 
-                    (here->MOS1sourceConductance+here->MOS1gds+
-                    here->MOS1gbs+xnrm*(here->MOS1gm+here->MOS1gmbs)+gcgs);
+		(here->MOS1sourceConductance+here->MOS1gds+
+		 here->MOS1gbs+xnrm*(here->MOS1gm+here->MOS1gmbs)+gcgs);
             *(here->MOS1DdpPtr) += (-here->MOS1drainConductance);
             *(here->MOS1GbPtr) -= gcgb;
             *(here->MOS1GdpPtr) -= gcgd;
@@ -1008,12 +909,12 @@ bypass:
             *(here->MOS1DPgPtr) += ((xnrm-xrev)*here->MOS1gm-gcgd);
             *(here->MOS1DPbPtr) += (-here->MOS1gbd+(xnrm-xrev)*here->MOS1gmbs);
             *(here->MOS1DPspPtr) += (-here->MOS1gds-xnrm*
-                    (here->MOS1gm+here->MOS1gmbs));
+				     (here->MOS1gm+here->MOS1gmbs));
             *(here->MOS1SPgPtr) += (-(xnrm-xrev)*here->MOS1gm-gcgs);
             *(here->MOS1SPsPtr) += (-here->MOS1sourceConductance);
             *(here->MOS1SPbPtr) += (-here->MOS1gbs-(xnrm-xrev)*here->MOS1gmbs);
             *(here->MOS1SPdpPtr) += (-here->MOS1gds-xrev*
-                    (here->MOS1gm+here->MOS1gmbs));
+				     (here->MOS1gm+here->MOS1gmbs));
         }
     }
     return(OK);
diff --git a/src/spicelib/devices/mos1/mos1mpar.c b/src/spicelib/devices/mos1/mos1mpar.c
index 4eefc0e7d..9e08d2b56 100644
--- a/src/spicelib/devices/mos1/mos1mpar.c
+++ b/src/spicelib/devices/mos1/mos1mpar.c
@@ -17,7 +17,7 @@ MOS1mParam(param,value,inModel)
     IFvalue *value;
     GENmodel *inModel;
 {
-    register MOS1model *model = (MOS1model *)inModel;
+    MOS1model *model = (MOS1model *)inModel;
     switch(param) {
         case MOS1_MOD_TNOM:
             model->MOS1tnom = value->rValue+CONSTCtoK;
diff --git a/src/spicelib/devices/mos1/mos1noi.c b/src/spicelib/devices/mos1/mos1noi.c
index 37e303a4b..58b4b5d77 100644
--- a/src/spicelib/devices/mos1/mos1noi.c
+++ b/src/spicelib/devices/mos1/mos1noi.c
@@ -29,12 +29,12 @@ MOS1noise (mode, operation, genmodel, ckt, data, OnDens)
     int operation;
     GENmodel *genmodel;
     CKTcircuit *ckt;
-    register Ndata *data;
+    Ndata *data;
     double *OnDens;
 {
     MOS1model *firstModel = (MOS1model *) genmodel;
-    register MOS1model *model;
-    register MOS1instance *inst;
+    MOS1model *model;
+    MOS1instance *inst;
     char name[N_MXVLNTH];
     double coxSquared;
     double tempOnoise;
diff --git a/src/spicelib/devices/mos1/mos1pzld.c b/src/spicelib/devices/mos1/mos1pzld.c
index 162dd9dd4..7be6fd345 100644
--- a/src/spicelib/devices/mos1/mos1pzld.c
+++ b/src/spicelib/devices/mos1/mos1pzld.c
@@ -17,11 +17,11 @@ Author: 1985 Thomas L. Quarles
 int
 MOS1pzLoad(inModel,ckt,s)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     SPcomplex *s;
 {
-    register MOS1model *model = (MOS1model*)inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model*)inModel;
+    MOS1instance *here;
     int xnrm;
     int xrev;
     double xgs;
diff --git a/src/spicelib/devices/mos1/mos1sacl.c b/src/spicelib/devices/mos1/mos1sacl.c
index 53fabf24a..eab4eff94 100644
--- a/src/spicelib/devices/mos1/mos1sacl.c
+++ b/src/spicelib/devices/mos1/mos1sacl.c
@@ -19,10 +19,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS1sAcLoad(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-    register MOS1model *model = (MOS1model*)inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model*)inModel;
+    MOS1instance *here;
     int xnrm;
     int xrev;
     double A0;
diff --git a/src/spicelib/devices/mos1/mos1set.c b/src/spicelib/devices/mos1/mos1set.c
index 21067f6d8..6be62af20 100644
--- a/src/spicelib/devices/mos1/mos1set.c
+++ b/src/spicelib/devices/mos1/mos1set.c
@@ -17,13 +17,13 @@ Author: 1985 Thomas L. Quarles
 
 int
 MOS1setup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     int *states;
 {
-    register MOS1model *model = (MOS1model *)inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model *)inModel;
+    MOS1instance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/mos1/mos1sld.c b/src/spicelib/devices/mos1/mos1sld.c
index 2b1bef937..e885afd1c 100644
--- a/src/spicelib/devices/mos1/mos1sld.c
+++ b/src/spicelib/devices/mos1/mos1sld.c
@@ -20,8 +20,8 @@ MOS1sLoad(inModel,ckt)
 GENmodel *inModel;
 CKTcircuit *ckt;
 {
-    register MOS1model *model = (MOS1model *)inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model *)inModel;
+    MOS1instance *here;
     double   SaveState[44];
     int    save_mode;
     int    i;
diff --git a/src/spicelib/devices/mos1/mos1sprt.c b/src/spicelib/devices/mos1/mos1sprt.c
index 0775d8e16..57469bffc 100644
--- a/src/spicelib/devices/mos1/mos1sprt.c
+++ b/src/spicelib/devices/mos1/mos1sprt.c
@@ -18,13 +18,13 @@ Author: 1985 Thomas L. Quarles
 void
 MOS1sPrint(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 /* Pretty print the sensitivity info for all the MOS1 
          * devices  in the circuit.
          */
 {
-    register MOS1model *model = (MOS1model *)inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model *)inModel;
+    MOS1instance *here;
 
     printf("LEVEL 1 MOSFETS-----------------\n");
     /*  loop through all the MOS1 models */
diff --git a/src/spicelib/devices/mos1/mos1sset.c b/src/spicelib/devices/mos1/mos1sset.c
index 59ca505cd..2096fc469 100644
--- a/src/spicelib/devices/mos1/mos1sset.c
+++ b/src/spicelib/devices/mos1/mos1sset.c
@@ -13,14 +13,14 @@ Author: 1985 Thomas L. Quarles
 
 int
 MOS1sSetup(info,inModel)
-register SENstruct *info;
+SENstruct *info;
 GENmodel *inModel;
 /* loop through all the devices and 
          * allocate parameter #s to design parameters 
          */
 {
-    register MOS1model *model = (MOS1model *)inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model *)inModel;
+    MOS1instance *here;
 
     /*  loop through all the models */
     for( ; model != NULL; model = model->MOS1nextModel ) {
diff --git a/src/spicelib/devices/mos1/mos1supd.c b/src/spicelib/devices/mos1/mos1supd.c
index 37fefe911..9726eb124 100644
--- a/src/spicelib/devices/mos1/mos1supd.c
+++ b/src/spicelib/devices/mos1/mos1supd.c
@@ -16,10 +16,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS1sUpdate(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS1model *model = (MOS1model *)inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model *)inModel;
+    MOS1instance *here;
     int    iparmno;
     double sb;
     double sg;
diff --git a/src/spicelib/devices/mos1/mos1temp.c b/src/spicelib/devices/mos1/mos1temp.c
index ea93c84f5..72cf5d7f0 100644
--- a/src/spicelib/devices/mos1/mos1temp.c
+++ b/src/spicelib/devices/mos1/mos1temp.c
@@ -14,10 +14,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS1temp(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS1model *model = (MOS1model *)inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model *)inModel;
+    MOS1instance *here;
 
     double egfet,egfet1;
     double fact1,fact2;
diff --git a/src/spicelib/devices/mos1/mos1trun.c b/src/spicelib/devices/mos1/mos1trun.c
index d91420910..48dec293e 100644
--- a/src/spicelib/devices/mos1/mos1trun.c
+++ b/src/spicelib/devices/mos1/mos1trun.c
@@ -16,11 +16,11 @@ Author: 1985 Thomas L. Quarles
 int
 MOS1trunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 {
-    register MOS1model *model = (MOS1model *)inModel;
-    register MOS1instance *here;
+    MOS1model *model = (MOS1model *)inModel;
+    MOS1instance *here;
 
     for( ; model != NULL; model = model->MOS1nextModel) {
         for(here=model->MOS1instances;here!=NULL;here = here->MOS1nextInstance){
diff --git a/src/spicelib/devices/mos2/mos2acld.c b/src/spicelib/devices/mos2/mos2acld.c
index e598ce039..520c13e93 100644
--- a/src/spicelib/devices/mos2/mos2acld.c
+++ b/src/spicelib/devices/mos2/mos2acld.c
@@ -16,10 +16,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS2acLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
     int xnrm;
     int xrev;
     double xgs;
diff --git a/src/spicelib/devices/mos2/mos2conv.c b/src/spicelib/devices/mos2/mos2conv.c
index 1a35108c1..2eeb5b9e7 100644
--- a/src/spicelib/devices/mos2/mos2conv.c
+++ b/src/spicelib/devices/mos2/mos2conv.c
@@ -13,10 +13,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS2convTest(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
     double delvbs;
     double delvbd;
     double delvgs;
diff --git a/src/spicelib/devices/mos2/mos2dist.c b/src/spicelib/devices/mos2/mos2dist.c
index d4f0c4ef1..a4bca0f4e 100644
--- a/src/spicelib/devices/mos2/mos2dist.c
+++ b/src/spicelib/devices/mos2/mos2dist.c
@@ -14,7 +14,7 @@ Author: 1988 Jaijeet S Roychowdhury
 int
 MOS2disto(mode,genmodel,ckt)
  GENmodel *genmodel;
- register CKTcircuit *ckt;
+ CKTcircuit *ckt;
  int mode;
 
 /* assuming here that ckt->CKTomega has been initialised to 
@@ -40,7 +40,7 @@ MOS2disto(mode,genmodel,ckt)
  double r2h1m2y,i2h1m2y;
  double r2h1m2z, i2h1m2z;
  double temp, itemp;
- register MOS2instance *here;
+ MOS2instance *here;
 
 if (mode == D_SETUP)
  return(MOS2dSetup(model,ckt));
diff --git a/src/spicelib/devices/mos2/mos2dset.c b/src/spicelib/devices/mos2/mos2dset.c
index 9dfcad00c..22d3fce14 100644
--- a/src/spicelib/devices/mos2/mos2dset.c
+++ b/src/spicelib/devices/mos2/mos2dset.c
@@ -23,13 +23,13 @@ static double sig2[4] = {1.0,  1.0,-1.0, -1.0};
 int
 MOS2dSetup(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current value into the 
          * sparse matrix previously provided 
          */
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
     double Beta;
     double DrainSatCur;
     double EffectiveLength;
diff --git a/src/spicelib/devices/mos2/mos2load.c b/src/spicelib/devices/mos2/mos2load.c
index 8115d4ee5..c66f4901a 100644
--- a/src/spicelib/devices/mos2/mos2load.c
+++ b/src/spicelib/devices/mos2/mos2load.c
@@ -22,13 +22,13 @@ static double sig2[4] = {1.0,  1.0,-1.0, -1.0};
 int
 MOS2load(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current value into the 
          * sparse matrix previously provided 
          */
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
     int error;
     double Beta;
     double DrainSatCur;
@@ -82,27 +82,9 @@ MOS2load(inModel,ckt)
     int xnrm;
     int xrev;
     int Check;
-#ifndef NOBYPASS
     double tempv;
-#endif /*NOBYPASS*/
-#ifdef CAPBYPASS
-    int senflag;
-#endif /* CAPBYPASS */
     int SenCond=0;
 
-#ifdef CAPBYPASS
-    senflag = 0;
-    if(ckt->CKTsenInfo){
-        if(ckt->CKTsenInfo->SENstatus == PERTURBATION){
-            if((ckt->CKTsenInfo->SENmode == ACSEN)||
-                (ckt->CKTsenInfo->SENmode == TRANSEN)){
-                senflag = 1;
-            }
-        }
-    }
-#endif /* CAPBYPASS */
-
-
     /*  loop through all the MOS2 device models */
     for( ; model != NULL; model = model->MOS2nextModel ) {
 
@@ -272,7 +254,6 @@ MOS2load(inModel,ckt)
                  * can't handle it in one piece, so it is broken up
                  * into several stages here
                  */
-#ifndef NOBYPASS
                 tempv = MAX(fabs(cbhat),fabs(here->MOS2cbs+here->MOS2cbd))+
                         ckt->CKTabstol;
                 if((!(ckt->CKTmode & (MODEINITPRED|MODEINITTRAN|MODEINITSMSIG)
@@ -325,7 +306,6 @@ MOS2load(inModel,ckt)
                     }
                     goto bypass;
                 }
-#endif /*NOBYPASS*/
                 /* ok - bypass is out, do it the hard way */
 
                 von = model->MOS2type * here->MOS2von;
@@ -1018,17 +998,9 @@ doneval:
                  *
                  *.. bulk-drain and bulk-source depletion capacitances
                  */
-#ifdef CAPBYPASS
-                if(((ckt->CKTmode & (MODEINITPRED | MODEINITTRAN) ) ||
-                        fabs(delvbs) >= ckt->CKTreltol * MAX(fabs(vbs),
-                        fabs(*(ckt->CKTstate0+here->MOS2vbs)))+
-                        ckt->CKTvoltTol)|| senflag)
-#endif /*CAPBYPASS*/
                 {
                     /* can't bypass the diode capacitance calculations */
-#ifdef CAPZEROBYPASS
                     if(here->MOS2Cbs != 0 || here->MOS2Cbssw != 0) {
-#endif /*CAPZEROBYPASS*/
                     if (vbs < here->MOS2tDepCap){
                         arg=1-vbs/here->MOS2tBulkPot;
                         /*
@@ -1080,24 +1052,14 @@ doneval:
                                 vbs*(here->MOS2f2s+vbs*(here->MOS2f3s/2));
                         here->MOS2capbs=here->MOS2f2s+here->MOS2f3s*vbs;
                     }
-#ifdef CAPZEROBYPASS
                     } else {
                         *(ckt->CKTstate0 + here->MOS2qbs) = 0;
                         here->MOS2capbs=0;
                     }
-#endif /*CAPZEROBYPASS*/
                 }
-#ifdef CAPBYPASS
-                if(((ckt->CKTmode & (MODEINITPRED | MODEINITTRAN) ) ||
-                        fabs(delvbd) >= ckt->CKTreltol * MAX(fabs(vbd),
-                        fabs(*(ckt->CKTstate0+here->MOS2vbd)))+
-                        ckt->CKTvoltTol)|| senflag)
-#endif /*CAPBYPASS*/
                     /* can't bypass the diode capacitance calculations */
                 {
-#ifdef CAPZEROBYPASS
                     if(here->MOS2Cbd != 0 || here->MOS2Cbdsw != 0 ) {
-#endif /*CAPZEROBYPASS*/
                     if (vbd < here->MOS2tDepCap) {
                         arg=1-vbd/here->MOS2tBulkPot;
                         /*
@@ -1144,12 +1106,10 @@ doneval:
                                 vbd * (here->MOS2f2d + vbd * here->MOS2f3d/2);
                         here->MOS2capbd=here->MOS2f2d + vbd * here->MOS2f3d;
                     }
-#ifdef CAPZEROBYPASS
                 } else {
                     *(ckt->CKTstate0 + here->MOS2qbd) = 0;
                     here->MOS2capbd = 0;
                 }
-#endif /*CAPZEROBYPASS*/
                 }
                 if(SenCond && (ckt->CKTsenInfo->SENmode==TRANSEN)) goto next2;
 
@@ -1188,33 +1148,6 @@ doneval:
                 if (Check == 1) {
                     ckt->CKTnoncon++;
 		    ckt->CKTtroubleElt = (GENinstance *) here;
-#ifndef NEWCONV
-#ifdef STEPDEBUG
-                    printf("MOS2: %s limiting noncon\n",here->MOS2name);
-#endif /* STEPDEBUG */
-                } else {
-                    tol=ckt->CKTreltol*MAX(fabs(cdhat),fabs(here->MOS2cd))+
-                            ckt->CKTabstol;
-                    if (fabs(cdhat-here->MOS2cd) >= tol) { 
-                        ckt->CKTnoncon++;
-			ckt->CKTtroubleElt = (GENinstance *) here;
-#ifdef STEPDEBUG
-                        printf("MOS2: %s cd noncon cd=%g, cdhat=%g, mode=%d\n",
-                                here->MOS2name,here->MOS2cd,cdhat,
-                                here->MOS2mode);
-#endif /* STEPDEBUG */
-                    } else {
-                        tol=ckt->CKTreltol*
-        MAX(fabs(cbhat),fabs(here->MOS2cbs+here->MOS2cbd))+ ckt->CKTabstol;
-                        if (fabs(cbhat-(here->MOS2cbs+here->MOS2cbd)) > tol) {
-                            ckt->CKTnoncon++;
-			    ckt->CKTtroubleElt = (GENinstance *) here;
-#ifdef STEPDEBUG
-                            printf("MOS2: %s cb noncon\n",here->MOS2name);
-#endif /* STEPDEBUG */
-                        }
-                    }
-#endif /* NEWCONV */
                 }
             }
 next2:      *(ckt->CKTstate0 + here->MOS2vbs) = vbs;
@@ -1309,9 +1242,7 @@ next2:      *(ckt->CKTstate0 + here->MOS2vbs) = vbs;
                 }
 #endif /* PREDICTOR */
             }
-#ifndef NOBYPASS
 bypass:
-#endif /* NOBYPASS */
 
             if(SenCond) continue;
 
diff --git a/src/spicelib/devices/mos2/mos2mask.c b/src/spicelib/devices/mos2/mos2mask.c
index 5f65978bf..4713b8efc 100644
--- a/src/spicelib/devices/mos2/mos2mask.c
+++ b/src/spicelib/devices/mos2/mos2mask.c
@@ -18,7 +18,7 @@ MOS2mAsk(ckt,inModel,param,value)
     int param;
     IFvalue *value;
 {
-    register MOS2model *model = (MOS2model *)inModel;
+    MOS2model *model = (MOS2model *)inModel;
     switch(param) {
         case MOS2_MOD_TNOM:
             value->rValue = model->MOS2tnom - CONSTCtoK;
diff --git a/src/spicelib/devices/mos2/mos2mpar.c b/src/spicelib/devices/mos2/mos2mpar.c
index 5a97a9151..3c85b9b70 100644
--- a/src/spicelib/devices/mos2/mos2mpar.c
+++ b/src/spicelib/devices/mos2/mos2mpar.c
@@ -20,7 +20,7 @@ MOS2mParam(param,value,inModel)
     IFvalue *value;
     GENmodel *inModel;
 {
-    register MOS2model *model = (MOS2model *)inModel;
+    MOS2model *model = (MOS2model *)inModel;
     switch(param) {
         case MOS2_MOD_TNOM:
             model->MOS2tnom = value->rValue+CONSTCtoK;
diff --git a/src/spicelib/devices/mos2/mos2noi.c b/src/spicelib/devices/mos2/mos2noi.c
index 21efba6a3..b97553eda 100644
--- a/src/spicelib/devices/mos2/mos2noi.c
+++ b/src/spicelib/devices/mos2/mos2noi.c
@@ -29,12 +29,12 @@ MOS2noise (mode, operation, genmodel, ckt, data, OnDens)
     int operation;
     GENmodel *genmodel;
     CKTcircuit *ckt;
-    register Ndata *data;
+    Ndata *data;
     double *OnDens;
 {
     MOS2model *firstModel = (MOS2model *) genmodel;
-    register MOS2model *model;
-    register MOS2instance *inst;
+    MOS2model *model;
+    MOS2instance *inst;
     char name[N_MXVLNTH];
     double tempOnoise;
     double tempInoise;
diff --git a/src/spicelib/devices/mos2/mos2pzld.c b/src/spicelib/devices/mos2/mos2pzld.c
index bf231d25b..738126d43 100644
--- a/src/spicelib/devices/mos2/mos2pzld.c
+++ b/src/spicelib/devices/mos2/mos2pzld.c
@@ -17,11 +17,11 @@ Author: 1985 Thomas L. Quarles
 int
 MOS2pzLoad(inModel,ckt,s)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     SPcomplex *s;
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
     int xnrm;
     int xrev;
     double xgs;
diff --git a/src/spicelib/devices/mos2/mos2sacl.c b/src/spicelib/devices/mos2/mos2sacl.c
index cd014add3..d24dfe992 100644
--- a/src/spicelib/devices/mos2/mos2sacl.c
+++ b/src/spicelib/devices/mos2/mos2sacl.c
@@ -19,10 +19,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS2sAcLoad(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
     int xnrm;
     int xrev;
     double A0;
diff --git a/src/spicelib/devices/mos2/mos2set.c b/src/spicelib/devices/mos2/mos2set.c
index 5e50bfb81..329744483 100644
--- a/src/spicelib/devices/mos2/mos2set.c
+++ b/src/spicelib/devices/mos2/mos2set.c
@@ -14,16 +14,16 @@ Author: 1985 Thomas L. Quarles
 
 int
 MOS2setup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     int *states;
         /* load the MOS2 device structure with those pointers needed later 
          * for fast matrix loading 
          */
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/mos2/mos2sld.c b/src/spicelib/devices/mos2/mos2sld.c
index 0a31d6914..dd4019d54 100644
--- a/src/spicelib/devices/mos2/mos2sld.c
+++ b/src/spicelib/devices/mos2/mos2sld.c
@@ -20,8 +20,8 @@ MOS2sLoad(inModel,ckt)
 GENmodel *inModel;
 CKTcircuit *ckt;
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
     double   SaveState[44];
     int    save_mode;
     int    i;
diff --git a/src/spicelib/devices/mos2/mos2sprt.c b/src/spicelib/devices/mos2/mos2sprt.c
index a3890942d..2dade4a63 100644
--- a/src/spicelib/devices/mos2/mos2sprt.c
+++ b/src/spicelib/devices/mos2/mos2sprt.c
@@ -14,13 +14,13 @@ Author: 1985 Thomas L. Quarles
 void
 MOS2sPrint(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* Pretty print the sensitivity info for all the MOS2 
          * devices  in the circuit.
          */
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
 
     printf("LEVEL 1 MOSFETS-----------------\n");
     /*  loop through all the MOS2 models */
diff --git a/src/spicelib/devices/mos2/mos2sset.c b/src/spicelib/devices/mos2/mos2sset.c
index b002d7946..b2462853e 100644
--- a/src/spicelib/devices/mos2/mos2sset.c
+++ b/src/spicelib/devices/mos2/mos2sset.c
@@ -13,14 +13,14 @@ Author: 1985 Thomas L. Quarles
 
 int
 MOS2sSetup(info,inModel)
-register SENstruct *info;
+SENstruct *info;
 GENmodel *inModel;
 /* loop through all the devices and 
          * allocate parameter #s to design parameters 
          */
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
 
     /*  loop through all the models */
     for( ; model != NULL; model = model->MOS2nextModel ) {
diff --git a/src/spicelib/devices/mos2/mos2supd.c b/src/spicelib/devices/mos2/mos2supd.c
index a3a13cb3e..b7a64b387 100644
--- a/src/spicelib/devices/mos2/mos2supd.c
+++ b/src/spicelib/devices/mos2/mos2supd.c
@@ -16,10 +16,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS2sUpdate(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
     int    iparmno;
     double sb;
     double sg;
diff --git a/src/spicelib/devices/mos2/mos2temp.c b/src/spicelib/devices/mos2/mos2temp.c
index b5f8d8521..9b12482ca 100644
--- a/src/spicelib/devices/mos2/mos2temp.c
+++ b/src/spicelib/devices/mos2/mos2temp.c
@@ -17,10 +17,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS2temp(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
     double egfet;
     double wkfngs;
     double wkfng;
diff --git a/src/spicelib/devices/mos2/mos2trun.c b/src/spicelib/devices/mos2/mos2trun.c
index 8a615dbef..2fc0f8f82 100644
--- a/src/spicelib/devices/mos2/mos2trun.c
+++ b/src/spicelib/devices/mos2/mos2trun.c
@@ -16,11 +16,11 @@ Author: 1985 Thomas L. Quarles
 int
 MOS2trunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 {
-    register MOS2model *model = (MOS2model *)inModel;
-    register MOS2instance *here;
+    MOS2model *model = (MOS2model *)inModel;
+    MOS2instance *here;
 
     for( ; model != NULL; model = model->MOS2nextModel) {
         for(here=model->MOS2instances;here!=NULL;here = here->MOS2nextInstance){
diff --git a/src/spicelib/devices/mos3/mos3acld.c b/src/spicelib/devices/mos3/mos3acld.c
index a1db9e4b0..b45d24878 100644
--- a/src/spicelib/devices/mos3/mos3acld.c
+++ b/src/spicelib/devices/mos3/mos3acld.c
@@ -16,10 +16,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS3acLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
     int xnrm;
     int xrev;
     double EffectiveLength;
diff --git a/src/spicelib/devices/mos3/mos3conv.c b/src/spicelib/devices/mos3/mos3conv.c
index d5318d64a..853256fc4 100644
--- a/src/spicelib/devices/mos3/mos3conv.c
+++ b/src/spicelib/devices/mos3/mos3conv.c
@@ -13,10 +13,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS3convTest(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
     double delvbs;
     double delvbd;
     double delvgs;
diff --git a/src/spicelib/devices/mos3/mos3dist.c b/src/spicelib/devices/mos3/mos3dist.c
index 94e95af10..6221c83ee 100644
--- a/src/spicelib/devices/mos3/mos3dist.c
+++ b/src/spicelib/devices/mos3/mos3dist.c
@@ -14,7 +14,7 @@ Author: 1988 Jaijeet S Roychowdhury
 int
 MOS3disto(mode,genmodel,ckt)
  GENmodel *genmodel;
- register CKTcircuit *ckt;
+ CKTcircuit *ckt;
  int mode;
 
 /* assuming here that ckt->CKTomega has been initialised to 
@@ -40,7 +40,7 @@ MOS3disto(mode,genmodel,ckt)
  double r2h1m2y,i2h1m2y;
  double r2h1m2z, i2h1m2z;
  double temp, itemp;
- register MOS3instance *here;
+ MOS3instance *here;
 
 if (mode == D_SETUP)
  return(MOS3dSetup(model,ckt));
diff --git a/src/spicelib/devices/mos3/mos3dset.c b/src/spicelib/devices/mos3/mos3dset.c
index 6013da964..985d5d1be 100644
--- a/src/spicelib/devices/mos3/mos3dset.c
+++ b/src/spicelib/devices/mos3/mos3dset.c
@@ -17,13 +17,13 @@ Author: 1988 Jaijeet S Roychowdhury
 int
 MOS3dSetup(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current value into the 
          * sparse matrix previously provided 
          */
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
     double Beta;
     double DrainSatCur;
     double EffectiveLength;
diff --git a/src/spicelib/devices/mos3/mos3load.c b/src/spicelib/devices/mos3/mos3load.c
index d4d8242b4..250fd154f 100644
--- a/src/spicelib/devices/mos3/mos3load.c
+++ b/src/spicelib/devices/mos3/mos3load.c
@@ -16,13 +16,13 @@ Author: 1985 Thomas L. Quarles
 int
 MOS3load(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current value into the 
          * sparse matrix previously provided 
          */
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
     double Beta;
     double DrainSatCur;
     double EffectiveLength;
@@ -74,27 +74,16 @@ MOS3load(inModel,ckt)
     double capgd;   /* total gate-drain capacitance */
     double capgb;   /* total gate-bulk capacitance */
     int Check;
-#ifndef NOBYPASS
     double tempv;
-#endif /*NOBYPASS*/
     int error;
-#ifdef CAPBYPASS
-    int senflag;
-#endif /* CAPBYPASS */
     int SenCond;
     double vt;  /* vt at instance temperature */
 
 
-#ifdef CAPBYPASS
-    senflag = 0;
-#endif /* CAPBYPASS */
     if(ckt->CKTsenInfo){
         if(ckt->CKTsenInfo->SENstatus == PERTURBATION) {
             if((ckt->CKTsenInfo->SENmode == ACSEN)||
                 (ckt->CKTsenInfo->SENmode == TRANSEN)){
-#ifdef CAPBYPASS
-                senflag = 1;
-#endif /* CAPBYPASS */
             }
             goto next;
         }
@@ -122,10 +111,6 @@ next:
 
             }
             SenCond = ckt->CKTsenInfo && here->MOS3senPertFlag;
-#ifdef DETAILPROF
-asm("   .globl mos3pta");
-asm("mos3pta:");
-#endif /* DETAILPROF */
 
             /* first, we compute a few useful values - these could be
              * pre-computed, but for historical reasons are still done
@@ -192,10 +177,6 @@ asm("mos3pta:");
                 goto next1;
             }
 
-#ifdef DETAILPROF
-asm("   .globl mos3ptax");
-asm("mos3ptax:");
-#endif /* DETAILPROF */
 
             /* 
              * ok - now to do the start-up operations
@@ -250,10 +231,6 @@ asm("mos3ptax:");
 #endif /*PREDICTOR*/
 
                 /* now some common crunching for some more useful quantities */
-#ifdef DETAILPROF
-asm("   .globl mos3ptay");
-asm("mos3ptay:");
-#endif /* DETAILPROF */
 
                 vbd=vbs-vds;
                 vgd=vgs-vds;
@@ -288,11 +265,6 @@ asm("mos3ptay:");
                     here->MOS3gbd * delvbd +
                     here->MOS3gbs * delvbs ;
 
-#ifdef DETAILPROF
-asm("   .globl mos3ptb");
-asm("mos3ptb:");
-#endif /* DETAILPROF */
-#ifndef NOBYPASS
                 /* now lets see if we can bypass (ugh) */
                 /* the following mess should be one if statement, but
                  * many compilers can't handle it all at once, so it
@@ -346,12 +318,7 @@ asm("mos3ptb:");
                     }
                     goto bypass;
                 }
-#endif /*NOBYPASS*/
 
-#ifdef DETAILPROF
-asm("   .globl mos3ptc");
-asm("mos3ptc:");
-#endif /* DETAILPROF */
                 /* ok - bypass is out, do it the hard way */
 
                 von = model->MOS3type * here->MOS3von;
@@ -392,10 +359,6 @@ asm("mos3ptc:");
 
             } else {
 
-#ifdef DETAILPROF
-asm("   .globl mos3ptd");
-asm("mos3ptd:");
-#endif /* DETAILPROF */
                 /* ok - not one of the simple cases, so we have to
                  * look at all of the possibilities for why we were
                  * called.  We still just initialize the three voltages
@@ -418,10 +381,6 @@ asm("mos3ptd:");
                 } 
             }
 
-#ifdef DETAILPROF
-asm("   .globl mos3pte");
-asm("mos3pte:");
-#endif /* DETAILPROF */
             /*
              * now all the preliminaries are over - we can start doing the
              * real work
@@ -466,10 +425,6 @@ next1:      if(vbs <= 0) {
                 here->MOS3mode = -1;
             }
 
-#ifdef DETAILPROF
-asm("   .globl mos3ptf");
-asm("mos3ptf:");
-#endif /* DETAILPROF */
             {
             /*
              * subroutine moseq3(vds,vbs,vgs,gm,gds,gmbs,
@@ -880,10 +835,6 @@ innerline1000:;
              */
             }
 
-#ifdef DETAILPROF
-asm("   .globl mos3ptg");
-asm("mos3ptg:");
-#endif /* DETAILPROF */
 
             /* now deal with n vs p polarity */
 
@@ -910,17 +861,9 @@ asm("mos3ptg:");
                  *
                  *.. bulk-drain and bulk-source depletion capacitances
                  */
-#ifdef CAPBYPASS
-                if(((ckt->CKTmode & (MODEINITPRED | MODEINITTRAN) ) ||
-                        fabs(delvbs) >= ckt->CKTreltol * MAX(fabs(vbs),
-                        fabs(*(ckt->CKTstate0+here->MOS3vbs)))+
-                        ckt->CKTvoltTol)|| senflag )
-#endif /*CAPBYPASS*/
                 {
                     /* can't bypass the diode capacitance calculations */
-#ifdef CAPZEROBYPASS
                     if(here->MOS3Cbs != 0 || here->MOS3Cbssw != 0 ) {
-#endif /*CAPZEROBYPASS*/
                     if (vbs < here->MOS3tDepCap){
                         arg=1-vbs/here->MOS3tBulkPot;
                         /*
@@ -972,24 +915,14 @@ asm("mos3ptg:");
                                 vbs*(here->MOS3f2s+vbs*(here->MOS3f3s/2));
                         here->MOS3capbs=here->MOS3f2s+here->MOS3f3s*vbs;
                     }
-#ifdef CAPZEROBYPASS
                     } else {
                         *(ckt->CKTstate0 + here->MOS3qbs) = 0;
                         here->MOS3capbs=0;
                     }
-#endif /*CAPZEROBYPASS*/
                 }
-#ifdef CAPBYPASS
-                if(((ckt->CKTmode & (MODEINITPRED | MODEINITTRAN) ) ||
-                        fabs(delvbd) >= ckt->CKTreltol * MAX(fabs(vbd),
-                        fabs(*(ckt->CKTstate0+here->MOS3vbd)))+
-                        ckt->CKTvoltTol)|| senflag )
-#endif /*CAPBYPASS*/
                     /* can't bypass the diode capacitance calculations */
                 {
-#ifdef CAPZEROBYPASS
                     if(here->MOS3Cbd != 0 || here->MOS3Cbdsw != 0 ) {
-#endif /*CAPZEROBYPASS*/
                     if (vbd < here->MOS3tDepCap) {
                         arg=1-vbd/here->MOS3tBulkPot;
                         /*
@@ -1036,17 +969,11 @@ asm("mos3ptg:");
                                 vbd * (here->MOS3f2d + vbd * here->MOS3f3d/2);
                         here->MOS3capbd=here->MOS3f2d + vbd * here->MOS3f3d;
                     }
-#ifdef CAPZEROBYPASS
                 } else {
                     *(ckt->CKTstate0 + here->MOS3qbd) = 0;
                     here->MOS3capbd = 0;
                 }
-#endif /*CAPZEROBYPASS*/
                 }
-#ifdef DETAILPROF
-asm("   .globl mos3pth");
-asm("mos3pth:");
-#endif /* DETAILPROF */
                 if(SenCond && (ckt->CKTsenInfo->SENmode==TRANSEN)) goto next2;
 
                 if ( ckt->CKTmode & MODETRAN ) {
@@ -1074,10 +1001,6 @@ asm("mos3pth:");
                     here->MOS3cbs += *(ckt->CKTstate0 + here->MOS3cqbs);
                 }
             }
-#ifdef DETAILPROF
-asm("   .globl mos3pti");
-asm("mos3pti:");
-#endif /* DETAILPROF */
             if(SenCond) goto next2;
 
             /*
@@ -1088,30 +1011,9 @@ asm("mos3pti:");
                 if (Check == 1) {
                     ckt->CKTnoncon++;
 		    ckt->CKTtroubleElt = (GENinstance *) here;
-#ifndef NEWCONV
-                } else {
-                    tol=ckt->CKTreltol*MAX(fabs(cdhat),
-                            fabs(here->MOS3cd))+ckt->CKTabstol;
-                    if (fabs(cdhat-here->MOS3cd) >= tol) { 
-                        ckt->CKTnoncon++;
-			ckt->CKTtroubleElt = (GENinstance *) here;
-                    } else {
-                        tol=ckt->CKTreltol*MAX(fabs(cbhat),
-                                fabs(here->MOS3cbs+here->MOS3cbd))+
-                            ckt->CKTabstol;
-                        if (fabs(cbhat-(here->MOS3cbs+here->MOS3cbd)) > tol) {
-                            ckt->CKTnoncon++;
-			    ckt->CKTtroubleElt = (GENinstance *) here;
-                        }
-                    }
-#endif /* NEWCONV */
                 }
             }
 
-#ifdef DETAILPROF
-asm("   .globl mos3ptj");
-asm("mos3ptj:");
-#endif /* DETAILPROF */
 
             /* save things away for next time */
 
@@ -1120,10 +1022,6 @@ next2:      *(ckt->CKTstate0 + here->MOS3vbs) = vbs;
             *(ckt->CKTstate0 + here->MOS3vgs) = vgs;
             *(ckt->CKTstate0 + here->MOS3vds) = vds;
 
-#ifdef DETAILPROF
-asm("   .globl mos3ptk");
-asm("mos3ptk:");
-#endif /* DETAILPROF */
 
             /*
              *     meyer's capacitor model
@@ -1179,10 +1077,6 @@ asm("mos3ptk:");
                     here->MOS3cgb = capgb;
                 }
 
-#ifdef DETAILPROF
-asm("   .globl mos3ptl");
-asm("mos3ptl:");
-#endif /* DETAILPROF */
                 /*
                  *     store small-signal parameters (for meyer's model)
                  *  all parameters already stored, so done...
@@ -1226,10 +1120,6 @@ asm("mos3ptl:");
             }
 bypass:
             if(SenCond) continue;
-#ifdef DETAILPROF
-asm("   .globl mos3ptm");
-asm("mos3ptm:");
-#endif /* DETAILPROF */
 
             if ( (ckt->CKTmode & (MODEINITTRAN)) || 
                     (! (ckt->CKTmode & (MODETRAN)) )  ) {
@@ -1268,10 +1158,6 @@ asm("mos3ptm:");
              *     store charge storage info for meyer's cap in lx table
              */
 
-#ifdef DETAILPROF
-asm("   .globl mos3ptn");
-asm("mos3ptn:");
-#endif /* DETAILPROF */
             /*
              *  load current vector
              */
diff --git a/src/spicelib/devices/mos3/mos3mpar.c b/src/spicelib/devices/mos3/mos3mpar.c
index 4d47f2d7b..271985637 100644
--- a/src/spicelib/devices/mos3/mos3mpar.c
+++ b/src/spicelib/devices/mos3/mos3mpar.c
@@ -20,7 +20,7 @@ MOS3mParam(param,value,inModel)
     IFvalue *value;
     GENmodel *inModel;
 {
-    register MOS3model *model = (MOS3model *)inModel;
+    MOS3model *model = (MOS3model *)inModel;
     switch(param) {
         case MOS3_MOD_VTO:
             model->MOS3vt0 = value->rValue;
diff --git a/src/spicelib/devices/mos3/mos3noi.c b/src/spicelib/devices/mos3/mos3noi.c
index 054097717..3b9546658 100644
--- a/src/spicelib/devices/mos3/mos3noi.c
+++ b/src/spicelib/devices/mos3/mos3noi.c
@@ -29,12 +29,12 @@ MOS3noise (mode, operation, genmodel, ckt, data, OnDens)
     int operation;
     GENmodel *genmodel;
     CKTcircuit *ckt;
-    register Ndata *data;
+    Ndata *data;
     double *OnDens;
 {
     MOS3model *firstModel = (MOS3model *) genmodel;
-    register MOS3model *model;
-    register MOS3instance *inst;
+    MOS3model *model;
+    MOS3instance *inst;
     char name[N_MXVLNTH];
     double tempOnoise;
     double tempInoise;
diff --git a/src/spicelib/devices/mos3/mos3pzld.c b/src/spicelib/devices/mos3/mos3pzld.c
index c8ba529da..2710a3458 100644
--- a/src/spicelib/devices/mos3/mos3pzld.c
+++ b/src/spicelib/devices/mos3/mos3pzld.c
@@ -17,11 +17,11 @@ Author: 1985 Thomas L. Quarles
 int
 MOS3pzLoad(inModel,ckt,s)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     SPcomplex *s;
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
     int xnrm;
     int xrev;
     double xgs;
diff --git a/src/spicelib/devices/mos3/mos3sacl.c b/src/spicelib/devices/mos3/mos3sacl.c
index 5591afa36..7d8aa9875 100644
--- a/src/spicelib/devices/mos3/mos3sacl.c
+++ b/src/spicelib/devices/mos3/mos3sacl.c
@@ -19,10 +19,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS3sAcLoad(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
     int xnrm;
     int xrev;
     double A0;
diff --git a/src/spicelib/devices/mos3/mos3set.c b/src/spicelib/devices/mos3/mos3set.c
index 4114cf0dd..9c63da9d6 100644
--- a/src/spicelib/devices/mos3/mos3set.c
+++ b/src/spicelib/devices/mos3/mos3set.c
@@ -17,17 +17,17 @@ Author: 1985 Thomas L. Quarles
 
 int
 MOS3setup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     int *states;
         /* load the MOS3 device structure with those pointers needed later 
          * for fast matrix loading 
          */
 
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/mos3/mos3sld.c b/src/spicelib/devices/mos3/mos3sld.c
index ab795d0ac..c6bbf1cf4 100644
--- a/src/spicelib/devices/mos3/mos3sld.c
+++ b/src/spicelib/devices/mos3/mos3sld.c
@@ -20,8 +20,8 @@ MOS3sLoad(inModel,ckt)
 GENmodel *inModel;
 CKTcircuit *ckt;
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
     double   SaveState[44];
     int    save_mode;
     int    i;
diff --git a/src/spicelib/devices/mos3/mos3sprt.c b/src/spicelib/devices/mos3/mos3sprt.c
index a504d0b6a..09e916635 100644
--- a/src/spicelib/devices/mos3/mos3sprt.c
+++ b/src/spicelib/devices/mos3/mos3sprt.c
@@ -18,10 +18,10 @@ Author: 1985 Thomas L. Quarles
 void
 MOS3sPrint(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
 
     printf("LEVEL 1 MOSFETS-----------------\n");
     /*  loop through all the MOS3 models */
diff --git a/src/spicelib/devices/mos3/mos3sset.c b/src/spicelib/devices/mos3/mos3sset.c
index 876691003..6cdb427f8 100644
--- a/src/spicelib/devices/mos3/mos3sset.c
+++ b/src/spicelib/devices/mos3/mos3sset.c
@@ -17,11 +17,11 @@ Author: 1985 Thomas L. Quarles
 
 int
 MOS3sSetup(info,inModel)
-    register SENstruct *info;
+    SENstruct *info;
     GENmodel *inModel;
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
 
     /*  loop through all the models */
     for( ; model != NULL; model = model->MOS3nextModel ) {
diff --git a/src/spicelib/devices/mos3/mos3supd.c b/src/spicelib/devices/mos3/mos3supd.c
index 20d9dcb5e..ff4052608 100644
--- a/src/spicelib/devices/mos3/mos3supd.c
+++ b/src/spicelib/devices/mos3/mos3supd.c
@@ -14,10 +14,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS3sUpdate(inModel,ckt)
 GENmodel *inModel;
-register CKTcircuit *ckt;
+CKTcircuit *ckt;
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
     int    iparmno;
     double sb;
     double sg;
diff --git a/src/spicelib/devices/mos3/mos3temp.c b/src/spicelib/devices/mos3/mos3temp.c
index 52f4b0997..5dd598cf1 100644
--- a/src/spicelib/devices/mos3/mos3temp.c
+++ b/src/spicelib/devices/mos3/mos3temp.c
@@ -17,10 +17,10 @@ Author: 1985 Thomas L. Quarles
 int
 MOS3temp(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
     double wkfngs;
     double wkfng;
     double fermig;
diff --git a/src/spicelib/devices/mos3/mos3trun.c b/src/spicelib/devices/mos3/mos3trun.c
index 5fa7c21c5..4dd134c41 100644
--- a/src/spicelib/devices/mos3/mos3trun.c
+++ b/src/spicelib/devices/mos3/mos3trun.c
@@ -13,11 +13,11 @@ Author: 1985 Thomas L. Quarles
 int
 MOS3trunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 {
-    register MOS3model *model = (MOS3model *)inModel;
-    register MOS3instance *here;
+    MOS3model *model = (MOS3model *)inModel;
+    MOS3instance *here;
 
     for( ; model != NULL; model = model->MOS3nextModel) {
         for(here=model->MOS3instances;here!=NULL;here = here->MOS3nextInstance){
diff --git a/src/spicelib/devices/mos6/mos6conv.c b/src/spicelib/devices/mos6/mos6conv.c
index 5fa60bb52..85ccc755f 100644
--- a/src/spicelib/devices/mos6/mos6conv.c
+++ b/src/spicelib/devices/mos6/mos6conv.c
@@ -13,10 +13,10 @@ Author: 1989 Takayasu Sakurai
 int
 MOS6convTest(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS6model *model = (MOS6model*)inModel;
-    register MOS6instance *here;
+    MOS6model *model = (MOS6model*)inModel;
+    MOS6instance *here;
     double delvbs;
     double delvbd;
     double delvgs;
diff --git a/src/spicelib/devices/mos6/mos6load.c b/src/spicelib/devices/mos6/mos6load.c
index f0b5e8551..c3f4dc477 100644
--- a/src/spicelib/devices/mos6/mos6load.c
+++ b/src/spicelib/devices/mos6/mos6load.c
@@ -16,13 +16,13 @@ Author: 1989 Takayasu Sakurai
 int
 MOS6load(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current value into the 
          * sparse matrix previously provided 
          */
 {
-    register MOS6model *model = (MOS6model *) inModel;
-    register MOS6instance *here;
+    MOS6model *model = (MOS6model *) inModel;
+    MOS6instance *here;
     double betac;
     double DrainSatCur;
     double EffectiveLength;
@@ -75,24 +75,11 @@ MOS6load(inModel,ckt)
     double capgd;   /* total gate-drain capacitance */
     double capgb;   /* total gate-bulk capacitance */
     int Check;
-#ifndef NOBYPASS
     double tempv;
-#endif /*NOBYPASS*/
     int error;
-#ifdef CAPBYPASS
-    int senflag;
-#endif /* CAPBYPASS */ 
     int SenCond;
 
 
-#ifdef CAPBYPASS
-    senflag = 0;
-    if(ckt->CKTsenInfo && ckt->CKTsenInfo->SENstatus == PERTURBATION &&
-        (ckt->CKTsenInfo->SENmode & (ACSEN | TRANSEN))) {
-        senflag = 1;
-    }
-#endif /* CAPBYPASS */ 
-
     /*  loop through all the MOS6 device models */
     for( ; model != NULL; model = model->MOS6nextModel ) {
 
@@ -118,10 +105,6 @@ MOS6load(inModel,ckt)
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mospta");
-asm("mospta:");
-#endif /*DETAILPROF*/
 
             /* first, we compute a few useful values - these could be
              * pre-computed, but for historical reasons are still done
@@ -278,11 +261,6 @@ asm("mospta:");
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptb");
-asm("mosptb:");
-#endif /*DETAILPROF*/
-#ifndef NOBYPASS
                 /* now lets see if we can bypass (ugh) */
                 /* the following mess should be one if statement, but
                  * many compilers can't handle it all at once, so it
@@ -342,15 +320,10 @@ asm("mosptb:");
                     }
                     goto bypass;
                 }
-#endif /*NOBYPASS*/
 /*
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptc");
-asm("mosptc:");
-#endif /*DETAILPROF*/
                 /* ok - bypass is out, do it the hard way */
 
                 von = model->MOS6type * here->MOS6von;
@@ -392,10 +365,6 @@ asm("mosptc:");
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptd");
-asm("mosptd:");
-#endif /*DETAILPROF*/
             } else {
 
                 /* ok - not one of the simple cases, so we have to
@@ -423,10 +392,6 @@ asm("mosptd:");
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mospte");
-asm("mospte:");
-#endif /*DETAILPROF*/
 
             /*
              * now all the preliminaries are over - we can start doing the
@@ -475,10 +440,6 @@ next1:      if(vbs <= 0) {
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptf");
-asm("mosptf:");
-#endif /*DETAILPROF*/
             {
             /*
              *     this block of code evaluates the drain current and its 
@@ -573,10 +534,6 @@ asm("mosptf:");
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptg");
-asm("mosptg:");
-#endif /*DETAILPROF*/
 
             /* now deal with n vs p polarity */
 
@@ -603,17 +560,9 @@ asm("mosptg:");
                  *
                  *.. bulk-drain and bulk-source depletion capacitances
                  */
-#ifdef CAPBYPASS
-                if(((ckt->CKTmode & (MODEINITPRED | MODEINITTRAN) ) ||
-                        fabs(delvbs) >= ckt->CKTreltol * MAX(fabs(vbs),
-                        fabs(*(ckt->CKTstate0+here->MOS6vbs)))+
-                        ckt->CKTvoltTol)|| senflag)
-#endif /*CAPBYPASS*/
                 {
                     /* can't bypass the diode capacitance calculations */
-#ifdef CAPZEROBYPASS
                     if(here->MOS6Cbs != 0 || here->MOS6Cbssw != 0 ) {
-#endif /*CAPZEROBYPASS*/
                     if (vbs < here->MOS6tDepCap){
                         arg=1-vbs/here->MOS6tBulkPot;
                         /*
@@ -665,24 +614,14 @@ asm("mosptg:");
                                 vbs*(here->MOS6f2s+vbs*(here->MOS6f3s/2));
                         here->MOS6capbs=here->MOS6f2s+here->MOS6f3s*vbs;
                     }
-#ifdef CAPZEROBYPASS
                     } else {
                         *(ckt->CKTstate0 + here->MOS6qbs) = 0;
                         here->MOS6capbs=0;
                     }
-#endif /*CAPZEROBYPASS*/
                 }
-#ifdef CAPBYPASS
-                if(((ckt->CKTmode & (MODEINITPRED | MODEINITTRAN) ) ||
-                        fabs(delvbd) >= ckt->CKTreltol * MAX(fabs(vbd),
-                        fabs(*(ckt->CKTstate0+here->MOS6vbd)))+
-                        ckt->CKTvoltTol)|| senflag)
-#endif /*CAPBYPASS*/
                     /* can't bypass the diode capacitance calculations */
                 {
-#ifdef CAPZEROBYPASS
                     if(here->MOS6Cbd != 0 || here->MOS6Cbdsw != 0 ) {
-#endif /*CAPZEROBYPASS*/
                     if (vbd < here->MOS6tDepCap) {
                         arg=1-vbd/here->MOS6tBulkPot;
                         /*
@@ -729,21 +668,15 @@ asm("mosptg:");
                                 vbd * (here->MOS6f2d + vbd * here->MOS6f3d/2);
                         here->MOS6capbd=here->MOS6f2d + vbd * here->MOS6f3d;
                     }
-#ifdef CAPZEROBYPASS
                 } else {
                     *(ckt->CKTstate0 + here->MOS6qbd) = 0;
                     here->MOS6capbd = 0;
                 }
-#endif /*CAPZEROBYPASS*/
                 }
 /*
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mospth");
-asm("mospth:");
-#endif /*DETAILPROF*/
 
                 if(SenCond && (ckt->CKTsenInfo->SENmode==TRANSEN)) goto next2;
 
@@ -776,10 +709,6 @@ asm("mospth:");
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mospti");
-asm("mospti:");
-#endif /*DETAILPROF*/
 
             if(SenCond) goto next2;
 
@@ -792,33 +721,12 @@ asm("mospti:");
                 if (Check == 1) {
                     ckt->CKTnoncon++;
 		    ckt->CKTtroubleElt = (GENinstance *) here;
-#ifndef NEWCONV
-                } else {
-                    tol=ckt->CKTreltol*MAX(fabs(cdhat),
-                            fabs(here->MOS6cd))+ckt->CKTabstol;
-                    if (fabs(cdhat-here->MOS6cd) >= tol) { 
-                        ckt->CKTnoncon++;
-			ckt->CKTtroubleElt = (GENinstance *) here;
-                    } else {
-                        tol=ckt->CKTreltol*MAX(fabs(cbhat),
-                                fabs(here->MOS6cbs+here->MOS6cbd))+
-                                ckt->CKTabstol;
-                        if (fabs(cbhat-(here->MOS6cbs+here->MOS6cbd)) > tol) {
-                            ckt->CKTnoncon++;
-			    ckt->CKTtroubleElt = (GENinstance *) here;
-                        }
-                    }
-#endif /*NEWCONV*/
                 }
             }
 /*
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptj");
-asm("mosptj:");
-#endif /*DETAILPROF*/
 
             /* save things away for next time */
 
@@ -831,10 +739,6 @@ next2:      *(ckt->CKTstate0 + here->MOS6vbs) = vbs;
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptk");
-asm("mosptk:");
-#endif /*DETAILPROF*/
             /*
              *     meyer's capacitor model
              */
@@ -892,10 +796,6 @@ asm("mosptk:");
 
 */
 
-#ifdef DETAILPROF
-asm("   .globl mosptl");
-asm("mosptl:");
-#endif /*DETAILPROF*/
                 /*
                  *     store small-signal parameters (for meyer's model)
                  *  all parameters already stored, so done...
diff --git a/src/spicelib/devices/mos6/mos6mask.c b/src/spicelib/devices/mos6/mos6mask.c
index 4eb93831e..d31ba2ac9 100644
--- a/src/spicelib/devices/mos6/mos6mask.c
+++ b/src/spicelib/devices/mos6/mos6mask.c
@@ -18,7 +18,7 @@ MOS6mAsk(ckt,inModel,param,value)
     int param;
     IFvalue *value;
 {
-    register MOS6model *model = (MOS6model *)inModel;
+    MOS6model *model = (MOS6model *)inModel;
     switch(param) {
         case MOS6_MOD_TNOM:
             value->rValue = model->MOS6tnom;
diff --git a/src/spicelib/devices/mos6/mos6mpar.c b/src/spicelib/devices/mos6/mos6mpar.c
index 12441118f..b204b2290 100644
--- a/src/spicelib/devices/mos6/mos6mpar.c
+++ b/src/spicelib/devices/mos6/mos6mpar.c
@@ -20,7 +20,7 @@ MOS6mParam(param,value,inModel)
     IFvalue *value;
     GENmodel *inModel;
 {
-    register MOS6model *model = (MOS6model *)inModel;
+    MOS6model *model = (MOS6model *)inModel;
     switch(param) {
         case MOS6_MOD_TNOM:
             model->MOS6tnom = value->rValue+CONSTCtoK;
diff --git a/src/spicelib/devices/mos6/mos6set.c b/src/spicelib/devices/mos6/mos6set.c
index a6edf0720..3a9f382f4 100644
--- a/src/spicelib/devices/mos6/mos6set.c
+++ b/src/spicelib/devices/mos6/mos6set.c
@@ -17,13 +17,13 @@ Author: 1989 Takayasu Sakurai
 
 int
 MOS6setup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     int *states;
 {
-    register MOS6model *model = (MOS6model *)inModel;
-    register MOS6instance *here;
+    MOS6model *model = (MOS6model *)inModel;
+    MOS6instance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/mos6/mos6temp.c b/src/spicelib/devices/mos6/mos6temp.c
index 238b0b21b..b66f2549a 100644
--- a/src/spicelib/devices/mos6/mos6temp.c
+++ b/src/spicelib/devices/mos6/mos6temp.c
@@ -14,10 +14,10 @@ Author: 1989 Takayasu Sakurai
 int
 MOS6temp(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register MOS6model *model = (MOS6model *)inModel;
-    register MOS6instance *here;
+    MOS6model *model = (MOS6model *)inModel;
+    MOS6instance *here;
 
     double egfet,egfet1;
     double fact1,fact2;
diff --git a/src/spicelib/devices/mos6/mos6trun.c b/src/spicelib/devices/mos6/mos6trun.c
index 992304b69..7ae138534 100644
--- a/src/spicelib/devices/mos6/mos6trun.c
+++ b/src/spicelib/devices/mos6/mos6trun.c
@@ -16,11 +16,11 @@ Author: 1989 Takayasu Sakurai
 int
 MOS6trunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 {
-    register MOS6model *model = (MOS6model *)inModel;
-    register MOS6instance *here;
+    MOS6model *model = (MOS6model *)inModel;
+    MOS6instance *here;
 
     for( ; model != NULL; model = model->MOS6nextModel) {
         for(here=model->MOS6instances;here!=NULL;here = here->MOS6nextInstance){
diff --git a/src/spicelib/devices/sw/swacload.c b/src/spicelib/devices/sw/swacload.c
index 4c3ab45f2..e34306bdc 100644
--- a/src/spicelib/devices/sw/swacload.c
+++ b/src/spicelib/devices/sw/swacload.c
@@ -16,14 +16,14 @@ Author: 1985 Gordon Jacobs
 int
 SWacLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* load the current values into the 
          * sparse matrix previously provided 
          * during AC analysis.
          */
 {
-    register SWmodel *model = (SWmodel *)inModel;
-    register SWinstance *here;
+    SWmodel *model = (SWmodel *)inModel;
+    SWinstance *here;
     double g_now;
     int current_state;
 
diff --git a/src/spicelib/devices/sw/swload.c b/src/spicelib/devices/sw/swload.c
index 16eea80b6..34b12feb8 100644
--- a/src/spicelib/devices/sw/swload.c
+++ b/src/spicelib/devices/sw/swload.c
@@ -14,13 +14,13 @@ Author: 1985 Gordon Jacobs
 int
 SWload(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current values into the 
          * sparse matrix previously provided 
          */
 {
-    register SWmodel *model = (SWmodel *) inModel;
-    register SWinstance *here;
+    SWmodel *model = (SWmodel *) inModel;
+    SWinstance *here;
     double g_now;
     double v_ctrl;
     double previous_state; 
diff --git a/src/spicelib/devices/sw/swnoise.c b/src/spicelib/devices/sw/swnoise.c
index e6a83d1b2..9e45f1538 100644
--- a/src/spicelib/devices/sw/swnoise.c
+++ b/src/spicelib/devices/sw/swnoise.c
@@ -30,12 +30,12 @@ SWnoise (mode, operation, genmodel, ckt, data, OnDens)
     int operation;
     GENmodel *genmodel;
     CKTcircuit *ckt;
-    register Ndata *data;
+    Ndata *data;
     double *OnDens;
 {
     SWmodel *firstModel = (SWmodel *) genmodel;
-    register SWmodel *model;
-    register SWinstance *inst;
+    SWmodel *model;
+    SWinstance *inst;
     char name[N_MXVLNTH];
     double tempOutNoise;
     double tempInNoise;
diff --git a/src/spicelib/devices/sw/swpzload.c b/src/spicelib/devices/sw/swpzload.c
index da36352b3..90a19ff59 100644
--- a/src/spicelib/devices/sw/swpzload.c
+++ b/src/spicelib/devices/sw/swpzload.c
@@ -18,15 +18,15 @@ Author: 1985 Gordon Jacobs
 int
 SWpzLoad(inModel,ckt,s)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     SPcomplex *s;
         /* load the current values into the 
          * sparse matrix previously provided 
          * during AC analysis.
          */
 {
-    register SWmodel *model = (SWmodel *)inModel;
-    register SWinstance *here;
+    SWmodel *model = (SWmodel *)inModel;
+    SWinstance *here;
     double g_now;
     int current_state;
 
diff --git a/src/spicelib/devices/sw/swsetup.c b/src/spicelib/devices/sw/swsetup.c
index 4a6b9505b..e5240926c 100644
--- a/src/spicelib/devices/sw/swsetup.c
+++ b/src/spicelib/devices/sw/swsetup.c
@@ -16,7 +16,7 @@ Author: 1985 Gordon Jacobs
 
 int
 SWsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
     CKTcircuit *ckt;
     int *states;
@@ -24,8 +24,8 @@ SWsetup(matrix,inModel,ckt,states)
          * for fast matrix loading 
          */
 {
-    register SWmodel *model = (SWmodel *)inModel;
-    register SWinstance *here;
+    SWmodel *model = (SWmodel *)inModel;
+    SWinstance *here;
 
     /*  loop through all the current source models */
     for( ; model != NULL; model = model->SWnextModel ) {
diff --git a/src/spicelib/devices/tra/traacct.c b/src/spicelib/devices/tra/traacct.c
index c42ced7de..84eef8a10 100644
--- a/src/spicelib/devices/tra/traacct.c
+++ b/src/spicelib/devices/tra/traacct.c
@@ -15,12 +15,12 @@ Author: 1985 Thomas L. Quarles
 
 int
 TRAaccept(ckt,inModel)
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     GENmodel *inModel;
 {
-    register TRAmodel *model = (TRAmodel *)inModel;
-    register TRAinstance *here;
-    register int i=0,j;
+    TRAmodel *model = (TRAmodel *)inModel;
+    TRAinstance *here;
+    int i=0,j;
     double v1,v2,v3,v4;
     double v5,v6,d1,d2,d3,d4;
     double *from,*to;
diff --git a/src/spicelib/devices/tra/traacld.c b/src/spicelib/devices/tra/traacld.c
index e9ce9408e..db96a1ab7 100644
--- a/src/spicelib/devices/tra/traacld.c
+++ b/src/spicelib/devices/tra/traacld.c
@@ -18,8 +18,8 @@ TRAacLoad(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register TRAmodel *model = (TRAmodel *)inModel;
-    register TRAinstance *here;
+    TRAmodel *model = (TRAmodel *)inModel;
+    TRAinstance *here;
     double real;
     double imag;
 
diff --git a/src/spicelib/devices/tra/traload.c b/src/spicelib/devices/tra/traload.c
index e4dacbf2d..4b4bbb569 100644
--- a/src/spicelib/devices/tra/traload.c
+++ b/src/spicelib/devices/tra/traload.c
@@ -23,11 +23,11 @@ TRAload(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register TRAmodel *model = (TRAmodel *)inModel;
-    register TRAinstance *here;
+    TRAmodel *model = (TRAmodel *)inModel;
+    TRAinstance *here;
     double t1,t2,t3;
     double f1,f2,f3;
-    register int i;
+    int i;
 
     /*  loop through all the transmission line models */
     for( ; model != NULL; model = model->TRAnextModel ) {
diff --git a/src/spicelib/devices/tra/trasetup.c b/src/spicelib/devices/tra/trasetup.c
index 13588c23f..b9ee401aa 100644
--- a/src/spicelib/devices/tra/trasetup.c
+++ b/src/spicelib/devices/tra/trasetup.c
@@ -17,16 +17,16 @@ Author: 1985 Thomas L. Quarles
 /* ARGSUSED */
 int
 TRAsetup(matrix,inModel,ckt,state)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     int *state;
         /* load the transmission line structure with those pointers needed later
          * for fast matrix loading 
          */
 {
-    register TRAmodel *model = (TRAmodel *)inModel;
-    register TRAinstance *here;
+    TRAmodel *model = (TRAmodel *)inModel;
+    TRAinstance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/tra/tratemp.c b/src/spicelib/devices/tra/tratemp.c
index 144e81445..64f178844 100644
--- a/src/spicelib/devices/tra/tratemp.c
+++ b/src/spicelib/devices/tra/tratemp.c
@@ -23,8 +23,8 @@ TRAtemp(inModel,ckt)
          * pre-process parameters for later use
          */
 {
-    register TRAmodel *model = (TRAmodel *)inModel;
-    register TRAinstance *here;
+    TRAmodel *model = (TRAmodel *)inModel;
+    TRAinstance *here;
 
     /*  loop through all the transmission line models */
     for( ; model != NULL; model = model->TRAnextModel ) {
diff --git a/src/spicelib/devices/tra/tratrunc.c b/src/spicelib/devices/tra/tratrunc.c
index 95be3f0f6..78eb1997d 100644
--- a/src/spicelib/devices/tra/tratrunc.c
+++ b/src/spicelib/devices/tra/tratrunc.c
@@ -16,12 +16,12 @@ Author: 1985 Thomas L. Quarles
 int
 TRAtrunc(inModel,ckt,timeStep)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     double *timeStep;
 
 {
-    register TRAmodel *model = (TRAmodel *)inModel;
-    register TRAinstance *here;
+    TRAmodel *model = (TRAmodel *)inModel;
+    TRAinstance *here;
     double v1,v2,v3,v4;
     double v5,v6,d1,d2,d3,d4;
     double tmp;
diff --git a/src/spicelib/devices/urc/urcmpar.c b/src/spicelib/devices/urc/urcmpar.c
index cc352923a..b7471f4f8 100644
--- a/src/spicelib/devices/urc/urcmpar.c
+++ b/src/spicelib/devices/urc/urcmpar.c
@@ -19,7 +19,7 @@ URCmParam(param,value,inModel)
     IFvalue *value;
     GENmodel *inModel;
 {
-    register URCmodel *model = (URCmodel *)inModel;
+    URCmodel *model = (URCmodel *)inModel;
     switch(param) {
         case URC_MOD_K:
             model->URCk = value->rValue;
diff --git a/src/spicelib/devices/urc/urcsetup.c b/src/spicelib/devices/urc/urcsetup.c
index a65970506..eddb07245 100644
--- a/src/spicelib/devices/urc/urcsetup.c
+++ b/src/spicelib/devices/urc/urcsetup.c
@@ -22,8 +22,8 @@ URCsetup(matrix,inModel,ckt,state)
         /* create the resistors/capacitors used to model the URC
          */
 {
-    register URCmodel *model = (URCmodel *)inModel;
-    register URCinstance *here;
+    URCmodel *model = (URCmodel *)inModel;
+    URCinstance *here;
     int rtype;
     int ctype;
     int dtype;
diff --git a/src/spicelib/devices/vccs/vccsload.c b/src/spicelib/devices/vccs/vccsload.c
index 73653b240..8d2ced769 100644
--- a/src/spicelib/devices/vccs/vccsload.c
+++ b/src/spicelib/devices/vccs/vccsload.c
@@ -22,8 +22,8 @@ VCCSload(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register VCCSmodel *model = (VCCSmodel *)inModel;
-    register VCCSinstance *here;
+    VCCSmodel *model = (VCCSmodel *)inModel;
+    VCCSinstance *here;
 
     /*  loop through all the source models */
     for( ; model != NULL; model = model->VCCSnextModel ) {
diff --git a/src/spicelib/devices/vccs/vccspzld.c b/src/spicelib/devices/vccs/vccspzld.c
index 26d713976..b5ba89d6a 100644
--- a/src/spicelib/devices/vccs/vccspzld.c
+++ b/src/spicelib/devices/vccs/vccspzld.c
@@ -24,8 +24,8 @@ VCCSpzLoad(inModel,ckt,s)
          * sparse matrix previously provided 
          */
 {
-    register VCCSmodel *model = (VCCSmodel *)inModel;
-    register VCCSinstance *here;
+    VCCSmodel *model = (VCCSmodel *)inModel;
+    VCCSinstance *here;
 
     /*  loop through all the source models */
     for( ; model != NULL; model = model->VCCSnextModel ) {
diff --git a/src/spicelib/devices/vccs/vccssacl.c b/src/spicelib/devices/vccs/vccssacl.c
index 02ff2c6cf..aa56d45e2 100644
--- a/src/spicelib/devices/vccs/vccssacl.c
+++ b/src/spicelib/devices/vccs/vccssacl.c
@@ -23,8 +23,8 @@ VCCSsAcLoad(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit *ckt;
 {
-    register VCCSmodel *model = (VCCSmodel *)inModel;
-    register VCCSinstance *here;
+    VCCSmodel *model = (VCCSmodel *)inModel;
+    VCCSinstance *here;
     double  vc;
     double  ivc;
 
diff --git a/src/spicelib/devices/vccs/vccsset.c b/src/spicelib/devices/vccs/vccsset.c
index 610c388e3..c4c21729e 100644
--- a/src/spicelib/devices/vccs/vccsset.c
+++ b/src/spicelib/devices/vccs/vccsset.c
@@ -21,13 +21,13 @@ Author: 1985 Thomas L. Quarles
 /*ARGSUSED*/
 int
 VCCSsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
     CKTcircuit *ckt;
     int *states;
 {
-    register VCCSmodel *model = (VCCSmodel *)inModel;
-    register VCCSinstance *here;
+    VCCSmodel *model = (VCCSmodel *)inModel;
+    VCCSinstance *here;
 
     /*  loop through all the current source models */
     for( ; model != NULL; model = model->VCCSnextModel ) {
diff --git a/src/spicelib/devices/vccs/vccssld.c b/src/spicelib/devices/vccs/vccssld.c
index 664b46213..c3970f16d 100644
--- a/src/spicelib/devices/vccs/vccssld.c
+++ b/src/spicelib/devices/vccs/vccssld.c
@@ -23,8 +23,8 @@ VCCSsLoad(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit *ckt;
 {
-    register VCCSmodel *model = (VCCSmodel *)inModel;
-    register VCCSinstance *here;
+    VCCSmodel *model = (VCCSmodel *)inModel;
+    VCCSinstance *here;
     double  vc;
 
     /*  loop through all the source models */
diff --git a/src/spicelib/devices/vccs/vccssprt.c b/src/spicelib/devices/vccs/vccssprt.c
index ac09f105c..c0a1db85a 100644
--- a/src/spicelib/devices/vccs/vccssprt.c
+++ b/src/spicelib/devices/vccs/vccssprt.c
@@ -21,10 +21,10 @@ Author: 1985 Thomas L. Quarles
 void
 VCCSsPrint(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register VCCSmodel *model = (VCCSmodel *)inModel;
-    register VCCSinstance *here;
+    VCCSmodel *model = (VCCSmodel *)inModel;
+    VCCSinstance *here;
 
     printf("VOLTAGE CONTROLLED CURRENT SOURCES-----------------\n");
     /*  loop through all the source models */
diff --git a/src/spicelib/devices/vccs/vccssset.c b/src/spicelib/devices/vccs/vccssset.c
index 259032ca4..7271c79b6 100644
--- a/src/spicelib/devices/vccs/vccssset.c
+++ b/src/spicelib/devices/vccs/vccssset.c
@@ -20,11 +20,11 @@ Author: 1985 Thomas L. Quarles
 
 int
 VCCSsSetup(info,inModel)
-    register SENstruct *info;
+    SENstruct *info;
     GENmodel *inModel;
 {
-    register VCCSmodel *model = (VCCSmodel *)inModel;
-    register VCCSinstance *here;
+    VCCSmodel *model = (VCCSmodel *)inModel;
+    VCCSinstance *here;
 
     /*  loop through all the current source models */
     for( ; model != NULL; model = model->VCCSnextModel ) {
diff --git a/src/spicelib/devices/vcvs/vcvsfbr.c b/src/spicelib/devices/vcvs/vcvsfbr.c
index 35620f245..be8eead72 100644
--- a/src/spicelib/devices/vcvs/vcvsfbr.c
+++ b/src/spicelib/devices/vcvs/vcvsfbr.c
@@ -16,12 +16,12 @@ Author: 1985 Thomas L. Quarles
 
 int
 VCVSfindBr(ckt,inModel,name)
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     GENmodel *inModel;
-    register IFuid name;
+    IFuid name;
 {
-    register VCVSmodel *model = (VCVSmodel *)inModel;
-    register VCVSinstance *here;
+    VCVSmodel *model = (VCVSmodel *)inModel;
+    VCVSinstance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/vcvs/vcvsload.c b/src/spicelib/devices/vcvs/vcvsload.c
index dbe38d850..b8103011c 100644
--- a/src/spicelib/devices/vcvs/vcvsload.c
+++ b/src/spicelib/devices/vcvs/vcvsload.c
@@ -22,8 +22,8 @@ VCVSload(inModel,ckt)
          * sparse matrix previously provided 
          */
 {
-    register VCVSmodel *model = (VCVSmodel *)inModel;
-    register VCVSinstance *here;
+    VCVSmodel *model = (VCVSmodel *)inModel;
+    VCVSinstance *here;
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->VCVSnextModel ) {
diff --git a/src/spicelib/devices/vcvs/vcvspzld.c b/src/spicelib/devices/vcvs/vcvspzld.c
index 8e890aba6..2a2191b7b 100644
--- a/src/spicelib/devices/vcvs/vcvspzld.c
+++ b/src/spicelib/devices/vcvs/vcvspzld.c
@@ -24,8 +24,8 @@ VCVSpzLoad(inModel,ckt,s)
          * sparse matrix previously provided 
          */
 {
-    register VCVSmodel *model = (VCVSmodel *)inModel;
-    register VCVSinstance *here;
+    VCVSmodel *model = (VCVSmodel *)inModel;
+    VCVSinstance *here;
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->VCVSnextModel ) {
diff --git a/src/spicelib/devices/vcvs/vcvssacl.c b/src/spicelib/devices/vcvs/vcvssacl.c
index c7d840ebb..d094038c5 100644
--- a/src/spicelib/devices/vcvs/vcvssacl.c
+++ b/src/spicelib/devices/vcvs/vcvssacl.c
@@ -22,8 +22,8 @@ VCVSsAcLoad(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit *ckt;
 {
-    register VCVSmodel *model = (VCVSmodel *)inModel;
-    register VCVSinstance *here;
+    VCVSmodel *model = (VCVSmodel *)inModel;
+    VCVSinstance *here;
     double   vc;
     double   ivc;
 
diff --git a/src/spicelib/devices/vcvs/vcvsset.c b/src/spicelib/devices/vcvs/vcvsset.c
index 0a995992a..47523f5ed 100644
--- a/src/spicelib/devices/vcvs/vcvsset.c
+++ b/src/spicelib/devices/vcvs/vcvsset.c
@@ -18,13 +18,13 @@ Author: 1985 Thomas L. Quarles
 /*ARGSUSED*/
 int
 VCVSsetup(matrix,inModel,ckt,states)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     int *states;
 {
-    register VCVSmodel *model = (VCVSmodel *)inModel;
-    register VCVSinstance *here;
+    VCVSmodel *model = (VCVSmodel *)inModel;
+    VCVSinstance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/vcvs/vcvssld.c b/src/spicelib/devices/vcvs/vcvssld.c
index f87d168af..ef2a62fd2 100644
--- a/src/spicelib/devices/vcvs/vcvssld.c
+++ b/src/spicelib/devices/vcvs/vcvssld.c
@@ -22,8 +22,8 @@ VCVSsLoad(inModel,ckt)
     GENmodel *inModel;
     CKTcircuit *ckt;
 {
-    register VCVSmodel *model = (VCVSmodel *)inModel;
-    register VCVSinstance *here;
+    VCVSmodel *model = (VCVSmodel *)inModel;
+    VCVSinstance *here;
     double   vc;
 
     /*  loop through all the voltage source models */
diff --git a/src/spicelib/devices/vcvs/vcvssprt.c b/src/spicelib/devices/vcvs/vcvssprt.c
index cb054cc0a..52926e957 100644
--- a/src/spicelib/devices/vcvs/vcvssprt.c
+++ b/src/spicelib/devices/vcvs/vcvssprt.c
@@ -20,10 +20,10 @@ Author: 1985 Thomas L. Quarles
 void
 VCVSsPrint(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register VCVSmodel *model = (VCVSmodel *)inModel;
-    register VCVSinstance *here;
+    VCVSmodel *model = (VCVSmodel *)inModel;
+    VCVSinstance *here;
 
     printf("VOLTAGE CONTROLLED VOLTAGE SOURCES-----------------\n");
     /*  loop through all the voltage source models */
diff --git a/src/spicelib/devices/vcvs/vcvssset.c b/src/spicelib/devices/vcvs/vcvssset.c
index df44a0580..35827a8fc 100644
--- a/src/spicelib/devices/vcvs/vcvssset.c
+++ b/src/spicelib/devices/vcvs/vcvssset.c
@@ -20,11 +20,11 @@ Author: 1985 Thomas L. Quarles
 
 int
 VCVSsSetup(info,inModel)
-    register SENstruct *info;
+    SENstruct *info;
     GENmodel *inModel;
 {
-    register VCVSmodel *model = (VCVSmodel *)inModel;
-    register VCVSinstance *here;
+    VCVSmodel *model = (VCVSmodel *)inModel;
+    VCVSinstance *here;
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->VCVSnextModel ) {
diff --git a/src/spicelib/devices/vsrc/vsrcacct.c b/src/spicelib/devices/vsrc/vsrcacct.c
index a59765eb5..b14b716a4 100644
--- a/src/spicelib/devices/vsrc/vsrcacct.c
+++ b/src/spicelib/devices/vsrc/vsrcacct.c
@@ -13,13 +13,13 @@ Author: 1985 Thomas L. Quarles
 
 int
 VSRCaccept(ckt,inModel)
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     GENmodel *inModel;
         /* set up the breakpoint table.
          */
 {
-    register VSRCmodel *model = (VSRCmodel *)inModel;
-    register VSRCinstance *here;
+    VSRCmodel *model = (VSRCmodel *)inModel;
+    VSRCinstance *here;
     int error;
 
     /*  loop through all the voltage source models */
@@ -148,7 +148,7 @@ VSRCaccept(ckt,inModel)
                 }
                 break;
                 case PWL: {
-                    register int i;
+                    int i;
                     if(ckt->CKTtime < *(here->VSRCcoeffs)) {
                         if(ckt->CKTbreak) {
                             error = CKTsetBreak(ckt,*(here->VSRCcoeffs));
diff --git a/src/spicelib/devices/vsrc/vsrcacld.c b/src/spicelib/devices/vsrc/vsrcacld.c
index f8f25376f..dffa4aba7 100644
--- a/src/spicelib/devices/vsrc/vsrcacld.c
+++ b/src/spicelib/devices/vsrc/vsrcacld.c
@@ -16,10 +16,10 @@ Author: 1985 Thomas L. Quarles
 int
 VSRCacLoad(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
 {
-    register VSRCmodel *model = (VSRCmodel *)inModel;
-    register VSRCinstance *here;
+    VSRCmodel *model = (VSRCmodel *)inModel;
+    VSRCinstance *here;
 
     for( ; model != NULL; model = model->VSRCnextModel ) {
 
diff --git a/src/spicelib/devices/vsrc/vsrcfbr.c b/src/spicelib/devices/vsrc/vsrcfbr.c
index b2ecf433e..9edcbeb50 100644
--- a/src/spicelib/devices/vsrc/vsrcfbr.c
+++ b/src/spicelib/devices/vsrc/vsrcfbr.c
@@ -15,12 +15,12 @@ Author: 1985 Thomas L. Quarles
 
 int
 VSRCfindBr(ckt,inModel,name)
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     GENmodel *inModel;
-    register IFuid name;
+    IFuid name;
 {
-    register VSRCmodel *model = (VSRCmodel *)inModel;
-    register VSRCinstance *here;
+    VSRCmodel *model = (VSRCmodel *)inModel;
+    VSRCinstance *here;
     int error;
     CKTnode *tmp;
 
diff --git a/src/spicelib/devices/vsrc/vsrcload.c b/src/spicelib/devices/vsrc/vsrcload.c
index b80d701be..3e0baedc9 100644
--- a/src/spicelib/devices/vsrc/vsrcload.c
+++ b/src/spicelib/devices/vsrc/vsrcload.c
@@ -14,13 +14,13 @@ Author: 1985 Thomas L. Quarles
 int
 VSRCload(inModel,ckt)
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
         /* actually load the current voltage value into the 
          * sparse matrix previously provided 
          */
 {
-    register VSRCmodel *model = (VSRCmodel *)inModel;
-    register VSRCinstance *here;
+    VSRCmodel *model = (VSRCmodel *)inModel;
+    VSRCinstance *here;
     double time;
 
     /*  loop through all the voltage source models */
@@ -175,7 +175,7 @@ VSRCload(inModel,ckt)
                 break;
 
                 case PWL: {
-                    register int i;
+                    int i;
                     double foo;
                     if(time < *(here->VSRCcoeffs)) {
                         foo = *(here->VSRCcoeffs + 1) ;
diff --git a/src/spicelib/devices/vsrc/vsrcpzld.c b/src/spicelib/devices/vsrc/vsrcpzld.c
index 7041460f4..84f4f9791 100644
--- a/src/spicelib/devices/vsrc/vsrcpzld.c
+++ b/src/spicelib/devices/vsrc/vsrcpzld.c
@@ -18,8 +18,8 @@ VSRCpzLoad(inModel,ckt,s)
     CKTcircuit *ckt;
     SPcomplex *s;
 {
-    register VSRCmodel *model = (VSRCmodel *)inModel;
-    register VSRCinstance *here;
+    VSRCmodel *model = (VSRCmodel *)inModel;
+    VSRCinstance *here;
 
     for( ; model != NULL; model = model->VSRCnextModel ) {
 
diff --git a/src/spicelib/devices/vsrc/vsrcpzs.c b/src/spicelib/devices/vsrc/vsrcpzs.c
index e1161db40..a613545bc 100644
--- a/src/spicelib/devices/vsrc/vsrcpzs.c
+++ b/src/spicelib/devices/vsrc/vsrcpzs.c
@@ -11,19 +11,14 @@ Author: 1985 Thomas L. Quarles
 #include "sperror.h"
 #include "suffix.h"
 
-/* ARGSUSED */
+/* load the voltage source structure with those pointers needed later
+ * for fast matrix loading */
 int
-VSRCpzSetup(matrix,inModel,ckt,state)
-    register SMPmatrix *matrix;
-    GENmodel *inModel;
-    register CKTcircuit *ckt;
-    int *state;
-        /* load the voltage source structure with those pointers needed later 
-         * for fast matrix loading 
-         */
+VSRCpzSetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt,
+	    int *state)
 {
-    register VSRCmodel *model = (VSRCmodel *)inModel;
-    register VSRCinstance *here;
+    VSRCmodel *model = (VSRCmodel *)inModel;
+    VSRCinstance *here;
     CKTnode *tmp;
     int error;
 
@@ -32,9 +27,9 @@ VSRCpzSetup(matrix,inModel,ckt,state)
 
         /* loop through all the instances of the model */
         for (here = model->VSRCinstances; here != NULL ;
-                here=here->VSRCnextInstance) {
+	     here = here->VSRCnextInstance) {
             
-            if(here->VSRCbranch == 0) {
+            if (here->VSRCbranch == 0) {
                 error = CKTmkCur(ckt,&tmp,here->VSRCname,"branch");
                 if(error) return(error);
                 here->VSRCbranch = tmp->number;
diff --git a/src/spicelib/devices/vsrc/vsrcset.c b/src/spicelib/devices/vsrc/vsrcset.c
index d3758b520..b32e2eed0 100644
--- a/src/spicelib/devices/vsrc/vsrcset.c
+++ b/src/spicelib/devices/vsrc/vsrcset.c
@@ -14,16 +14,16 @@ Author: 1985 Thomas L. Quarles
 /* ARGSUSED */
 int
 VSRCsetup(matrix,inModel,ckt,state)
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     GENmodel *inModel;
-    register CKTcircuit *ckt;
+    CKTcircuit *ckt;
     int *state;
         /* load the voltage source structure with those pointers needed later 
          * for fast matrix loading 
          */
 {
-    register VSRCmodel *model = (VSRCmodel *)inModel;
-    register VSRCinstance *here;
+    VSRCmodel *model = (VSRCmodel *)inModel;
+    VSRCinstance *here;
     CKTnode *tmp;
     int error;
 
diff --git a/src/spicelib/devices/vsrc/vsrctemp.c b/src/spicelib/devices/vsrc/vsrctemp.c
index 8dbae8ed7..d4acce280 100644
--- a/src/spicelib/devices/vsrc/vsrctemp.c
+++ b/src/spicelib/devices/vsrc/vsrctemp.c
@@ -19,8 +19,8 @@ VSRCtemp(inModel,ckt)
         /* Pre-process voltage source parameters 
          */
 {
-    register VSRCmodel *model = (VSRCmodel *)inModel;
-    register VSRCinstance *here;
+    VSRCmodel *model = (VSRCmodel *)inModel;
+    VSRCinstance *here;
     double radians;
 
     /*  loop through all the voltage source models */