--- trunk/src/cpus/bintrans_alpha.c	2007/10/08 16:19:28	21
+++ trunk/src/cpus/bintrans_alpha.c	2007/10/08 16:19:37	22
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2005  Anders Gavare.  All rights reserved.
+ *  Copyright (C) 2004-2006  Anders Gavare.  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: bintrans_alpha.c,v 1.1 2005/08/29 14:36:41 debug Exp $
+ *  $Id: bintrans_alpha.c,v 1.4 2006/02/09 22:40:26 debug Exp $
  *
  *  Alpha specific code for dynamic binary translation.
  *
@@ -122,11 +122,11 @@
 	0x86, 0x00, 0x00, 0x00,		/*  imb   */
 	0x01, 0x80, 0xfa, 0x6b,		/*  ret   */
 	0x1f, 0x04, 0xff, 0x47,		/*  nop   */
-	0x00, 0x00, 0xfe, 0x2e,		/*  unop  */
+	0x00, 0x00, 0xfe, 0x2f,		/*  unop  */
 	0x1f, 0x04, 0xff, 0x47,		/*  nop   */
-	0x00, 0x00, 0xfe, 0x2e,		/*  unop  */
+	0x00, 0x00, 0xfe, 0x2f,		/*  unop  */
 	0x1f, 0x04, 0xff, 0x47,		/*  nop   */
-	0x00, 0x00, 0xfe, 0x2e		/*  unop  */
+	0x00, 0x00, 0xfe, 0x2f		/*  unop  */
 };
 
 
@@ -170,8 +170,8 @@
 #define ofs_c0	((size_t)&dummy_vth32_table.bintrans_chunks[0] - (size_t)&dummy_vth32_table)
 #define ofs_cb (((size_t)&dummy_cpu.cd.mips.chunk_base_address) - (size_t)&dummy_cpu)
 
-#define ofs_h_l (((size_t)&dummy_cpu.cd.mips.host_load) - ((size_t)&dummy_cpu))
-#define ofs_h_s (((size_t)&dummy_cpu.cd.mips.host_store) - ((size_t)&dummy_cpu))
+#define ofs_h_l (((size_t)&dummy_cpu.cd.mips.host_OLD_load) - ((size_t)&dummy_cpu))
+#define ofs_h_s (((size_t)&dummy_cpu.cd.mips.host_OLD_store) - ((size_t)&dummy_cpu))
 
 
 static uint32_t bintrans_alpha_load_32bit[18] = {
@@ -179,8 +179,8 @@
 	0x209f0fff,	/*  lda     t3,4095				*/
 	0x48419682,	/*  srl     t1,0xc,t1	t1 = addr >> 12		*/
 	0x46240004,	/*  and     a1,t3,t3	t3 = addr & 4095	*/
-	0x40580642,	/*  s8addq  t1,t10,t1	&host_load[t1]		*/
-	0xa6620000,	/*  ldq     a3,0(t1)	a3 = host_load[t1]	*/
+	0x40580642,	/*  s8addq  t1,t10,t1	&host_OLD_load[t1]	*/
+	0xa6620000,	/*  ldq     a3,0(t1)	a3 = host_OLD_load[t1]	*/
 
 	/*  NULL? Then return failure at once.  */
 	0xe6600002,	/*  beq a3, return  */
@@ -201,8 +201,8 @@
 	0x209f0fff,	/*  lda     t3,4095				*/
 	0x48419682,	/*  srl     t1,0xc,t1	t1 = addr >> 12		*/
 	0x46240004,	/*  and     a1,t3,t3	t3 = addr & 4095	*/
-	0x404f0642,	/*  s8addq  t1,s6,t1	&host_store[t1]		*/
-	0xa6620000,	/*  ldq     a3,0(t1)	a3 = host_store[t1]	*/
+	0x404f0642,	/*  s8addq  t1,s6,t1	&host_OLD_store[t1]	*/
+	0xa6620000,	/*  ldq     a3,0(t1)	a3 = host_OLD_store[t1]	*/
 
 	/*  NULL? Then return failure at once.  */
 	/*  beq a3, return  */
@@ -2520,9 +2520,9 @@
 /*
  *  bintrans_backend_init():
  *
- *  This is neccessary for broken 2.95.4 compilers on FreeBSD/Alpha 4.9,
- *  and probably a few others. (For Compaq's CC, and for gcc 3.x, this
- *  wouldn't be neccessary, and the old code would have worked.)
+ *  This is necessary for broken 2.95.4 compilers on FreeBSD/Alpha 4.9, and
+ *  probably a few others. (For Compaq's CC, and for gcc 3.x, this wouldn't be
+ *  needed; the old code would have worked.)
  */
 static void bintrans_backend_init(void)
 { 
@@ -2568,8 +2568,8 @@
 	*p++ = 0xa5900000 | ofs_ra;	/*  ldq     s3,"gpr[ra]"(a0)  */
 	*p++ = 0xa5b00000 | ofs_t0;	/*  ldq     s4,"gpr[t0]"(a0)  */
 	*p++ = 0xa5d00000 | ofs_t1;	/*  ldq     s5,"gpr[t1]"(a0)  */
-	*p++ = 0xa5f00000 | ofs_h_s;	/*  ldq     s6,host_store(a0)  */
-	*p++ = 0xa7100000 | ofs_h_l;	/*  ldq     t10,host_load(a0)  */
+	*p++ = 0xa5f00000 | ofs_h_s;	/*  ldq     s6,host_OLD_store(a0)  */
+	*p++ = 0xa7100000 | ofs_h_l;	/*  ldq     t10,host_OLD_load(a0)  */
 	*p++ = 0xa7300000 | ofs_v0;	/*  ldq     t11,"gpr[v0]"(a0)  */
 
 	*p++ = 0x6b514000;		/*  jsr     ra,(a1),<back>  */