summaryrefslogtreecommitdiff
path: root/system/alpha
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2005-01-30 16:50:55 -0500
committerAli Saidi <saidi@eecs.umich.edu>2005-01-30 16:50:55 -0500
commitd60a6c86c5bd4f596995f9b379f62167cf08a7f0 (patch)
treea1b18b35afdc9fffd185e05357e9979a3f98d0f7 /system/alpha
parent5821f37cb6f1875f5912adc37a01139a159e697c (diff)
downloadgem5-d60a6c86c5bd4f596995f9b379f62167cf08a7f0.tar.xz
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
Diffstat (limited to 'system/alpha')
-rw-r--r--system/alpha/h/simos.h16
-rw-r--r--system/alpha/palcode/platform_m5.S4
-rw-r--r--system/alpha/palcode/platform_tlaser.S8
3 files changed, 4 insertions, 24 deletions
diff --git a/system/alpha/h/simos.h b/system/alpha/h/simos.h
deleted file mode 100644
index be5a5a93b..000000000
--- 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 9a7bf6160..52128e11c 100644
--- 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 a807d065c..3ad55f0f2 100644
--- 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