removed tlaserreg.h, rewrote necessary parts

deleted simos.h
deleted tlaserreg.h

palcode/platform_m5.S:
palcode/platform_tlaser.S:
    removed tlaserreg.h, rewrote necessary parts

diff --git a/system/alpha/h/simos.h b/system/alpha/h/simos.h
deleted file mode 100644 (file)
index be5a5a9..0000000
--- a/system/alpha/h/simos.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-/*
- * this contains the random stuff that is not defined
- * elsewhere
- * probably hacked up
- */
-
-
-#include "tlaser.h"  /* from the simulation tree */
-
-/*
- * wierd. different ways of referencing ips
- */
-
-#define ps ips

diff --git a/system/alpha/palcode/platform_m5.S b/system/alpha/palcode/platform_m5.S
index 9a7bf6160ac5d3efa9b81eede6b2d4c42d3327ea..52128e11cd7ceade9908ea6f63accf910ff1fdc1 100644 (file)
--- a/system/alpha/palcode/platform_m5.S
+++ b/system/alpha/palcode/platform_m5.S
@@ -32,9 +32,7 @@
 #include "fromHudsonOsf.h"
 #include "dc21164FromGasSources.h"
 #include "cserve.h"
-#include "tlaserreg.h"
-//#include "simos.h"
-
+#include "tlaser.h"
 
 #define ldlp ldl_p
 #define ldqp ldq_p

diff --git a/system/alpha/palcode/platform_tlaser.S b/system/alpha/palcode/platform_tlaser.S
index a807d065c023a5c857926b97c85d3894a8dbc1ec..3ad55f0f2127c7fba969b76c4fb5c83dd1ee50fd 100644 (file)
--- a/system/alpha/palcode/platform_tlaser.S
+++ b/system/alpha/palcode/platform_tlaser.S
@@ -32,9 +32,7 @@
 #include "fromHudsonOsf.h"
 #include "dc21164FromGasSources.h"
 #include "cserve.h"
-#include "tlaserreg.h"
-//#include "simos.h"
-
+#include "tlaser.h"
 
 #define ldlp ldl_p
 #define ldqp ldq_p
@@ -829,7 +827,7 @@ sys_int_20:
         beq    r14, tlep_ecc                   // Branch if not IPL14
         Get_TLSB_Node_Address(r14,r10)
 
-        lda    r10, tlsb_tlilid0_offset(r10)   // Get base TLILID address
+        lda    r10, 0xa00(r10)                 // Get base TLILID0 address
         ldlp   r13, 0(r10)                     // Read the TLILID register
 
 #if turbo_pcia_intr_fix == 0
@@ -853,7 +851,7 @@ tlep_intim:
         lda    r13, 0xffb(r31)                 // get upper GBUS address bits
         sll    r13, 28, r13                    // shift up to top
 
-        lda    r13, (tlep_watch_csrc_offset)(r13)      // full CSRC address
+        lda    r13, (0x300)(r13)  // full CSRC address (tlep watch csrc offset)
         ldqp   r13, 0(r13)                     // read CSRC
 
         lda    r13, 0x40(r31)                  // load Intim bit