From: drdani <drdani@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Thu, 21 Feb 2002 13:06:22 +0000 (+0000)
Subject: Replace $ with S in function names
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=909ff6198903c0feff992f63a29283c131bbc364;p=fw%2Fsdcc

Replace $ with S in function names


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1941 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/sim/ucsim/avr.src/avr.cc b/sim/ucsim/avr.src/avr.cc
index 2fda8bee..bef5a621 100644
--- a/sim/ucsim/avr.src/avr.cc
+++ b/sim/ucsim/avr.src/avr.cc
@@ -454,26 +454,26 @@ cl_avr::exec_inst(void)
 	  switch (code & 0xfe0f)
 	    {
 	    case 0x9000: return(lds_Rd_k(code));
-	    case 0x9001: return(ld_Rd_Z$(code));
-	    case 0x9002: return(ld_Rd_$Z(code));
+	    case 0x9001: return(ld_Rd_ZS(code));
+	    case 0x9002: return(ld_Rd_SZ(code));
 	    case 0x9004: return(lpm_Rd_Z(code));
-	    case 0x9005: return(lpm_Rd_Z$(code));
+	    case 0x9005: return(lpm_Rd_ZS(code));
 	    case 0x9006: return(elpm_Rd_Z(code));
-	    case 0x9007: return(elpm_Rd_Z$(code));
-	    case 0x9009: return(ld_Rd_Y$(code));
-	    case 0x900a: return(ld_Rd_$Y(code));
+	    case 0x9007: return(elpm_Rd_ZS(code));
+	    case 0x9009: return(ld_Rd_YS(code));
+	    case 0x900a: return(ld_Rd_SY(code));
 	    case 0x900c: return(ld_Rd_X(code));
-	    case 0x900d: return(ld_Rd_X$(code));
-	    case 0x900e: return(ld_Rd_$X(code));
+	    case 0x900d: return(ld_Rd_XS(code));
+	    case 0x900e: return(ld_Rd_SX(code));
 	    case 0x900f: return(pop_Rd(code));
 	    case 0x9200: return(sts_k_Rr(code));
-	    case 0x9201: return(st_Z$_Rr(code));
-	    case 0x9202: return(st_$Z_Rr(code));
-	    case 0x9209: return(st_Y$_Rr(code));
-	    case 0x920a: return(st_$Y_Rr(code));
+	    case 0x9201: return(st_ZS_Rr(code));
+	    case 0x9202: return(st_SZ_Rr(code));
+	    case 0x9209: return(st_YS_Rr(code));
+	    case 0x920a: return(st_SY_Rr(code));
 	    case 0x920c: return(st_X_Rr(code));
-	    case 0x920d: return(st_X$_Rr(code));
-	    case 0x920e: return(st_$X_Rr(code));
+	    case 0x920d: return(st_XS_Rr(code));
+	    case 0x920e: return(st_SX_Rr(code));
 	    case 0x920f: return(push_Rr(code));
 	    }
 	case 0x9400:
diff --git a/sim/ucsim/avr.src/move_cl.h b/sim/ucsim/avr.src/move_cl.h
index ffe7b4b7..46e11d2e 100644
--- a/sim/ucsim/avr.src/move_cl.h
+++ b/sim/ucsim/avr.src/move_cl.h
@@ -7,26 +7,26 @@
   virtual int ldi_Rd_K(t_mem code);
   virtual int movw_Rd_Rr(t_mem code);
   virtual int lds_Rd_k(t_mem code);
-  virtual int ld_Rd_Z$(t_mem code);
-  virtual int ld_Rd_$Z(t_mem code);
+  virtual int ld_Rd_ZS(t_mem code);
+  virtual int ld_Rd_SZ(t_mem code);
   virtual int lpm_Rd_Z(t_mem code);
-  virtual int lpm_Rd_Z$(t_mem code);
+  virtual int lpm_Rd_ZS(t_mem code);
   virtual int elpm_Rd_Z(t_mem code);
-  virtual int elpm_Rd_Z$(t_mem code);
-  virtual int ld_Rd_Y$(t_mem code);
-  virtual int ld_Rd_$Y(t_mem code);
+  virtual int elpm_Rd_ZS(t_mem code);
+  virtual int ld_Rd_YS(t_mem code);
+  virtual int ld_Rd_SY(t_mem code);
   virtual int ld_Rd_X(t_mem code);
-  virtual int ld_Rd_X$(t_mem code);
-  virtual int ld_Rd_$X(t_mem code);
+  virtual int ld_Rd_XS(t_mem code);
+  virtual int ld_Rd_SX(t_mem code);
   virtual int pop_Rd(t_mem code);
   virtual int sts_k_Rr(t_mem code);
-  virtual int st_Z$_Rr(t_mem code);
-  virtual int st_$Z_Rr(t_mem code);
-  virtual int st_Y$_Rr(t_mem code);
-  virtual int st_$Y_Rr(t_mem code);
+  virtual int st_ZS_Rr(t_mem code);
+  virtual int st_SZ_Rr(t_mem code);
+  virtual int st_YS_Rr(t_mem code);
+  virtual int st_SY_Rr(t_mem code);
   virtual int st_X_Rr(t_mem code);
-  virtual int st_X$_Rr(t_mem code);
-  virtual int st_$X_Rr(t_mem code);
+  virtual int st_XS_Rr(t_mem code);
+  virtual int st_SX_Rr(t_mem code);
   virtual int push_Rr(t_mem code);
   virtual int swap_Rd(t_mem code);
   virtual int ldd_Rd_Z_q(t_mem code);
diff --git a/sim/ucsim/avr.src/move_inst.cc b/sim/ucsim/avr.src/move_inst.cc
index 42c7590f..058be7ec 100644
--- a/sim/ucsim/avr.src/move_inst.cc
+++ b/sim/ucsim/avr.src/move_inst.cc
@@ -223,7 +223,7 @@ cl_avr::lds_Rd_k(t_mem code)
  */
 
 int
-cl_avr::ld_Rd_Z$(t_mem code)
+cl_avr::ld_Rd_ZS(t_mem code)
 {
   t_addr z, d;
 
@@ -247,7 +247,7 @@ cl_avr::ld_Rd_Z$(t_mem code)
  */
 
 int
-cl_avr::ld_Rd_$Z(t_mem code)
+cl_avr::ld_Rd_SZ(t_mem code)
 {
   t_addr z, d;
   t_mem data;
@@ -272,7 +272,7 @@ cl_avr::lpm_Rd_Z(t_mem code)
 
 
 int
-cl_avr::lpm_Rd_Z$(t_mem code)
+cl_avr::lpm_Rd_ZS(t_mem code)
 {
   return(resGO);
 }
@@ -286,7 +286,7 @@ cl_avr::elpm_Rd_Z(t_mem code)
 
 
 int
-cl_avr::elpm_Rd_Z$(t_mem code)
+cl_avr::elpm_Rd_ZS(t_mem code)
 {
   return(resGO);
 }
@@ -300,7 +300,7 @@ cl_avr::elpm_Rd_Z$(t_mem code)
  */
 
 int
-cl_avr::ld_Rd_Y$(t_mem code)
+cl_avr::ld_Rd_YS(t_mem code)
 {
   t_addr y, d;
 
@@ -324,7 +324,7 @@ cl_avr::ld_Rd_Y$(t_mem code)
  */
 
 int
-cl_avr::ld_Rd_$Y(t_mem code)
+cl_avr::ld_Rd_SY(t_mem code)
 {
   t_addr y, d;
   t_mem data;
@@ -370,7 +370,7 @@ cl_avr::ld_Rd_X(t_mem code)
  */
 
 int
-cl_avr::ld_Rd_X$(t_mem code)
+cl_avr::ld_Rd_XS(t_mem code)
 {
   t_addr x, d;
 
@@ -394,7 +394,7 @@ cl_avr::ld_Rd_X$(t_mem code)
  */
 
 int
-cl_avr::ld_Rd_$X(t_mem code)
+cl_avr::ld_Rd_SX(t_mem code)
 {
   t_addr x, d;
   t_mem data;
@@ -463,7 +463,7 @@ cl_avr::sts_k_Rr(t_mem code)
  */
 
 int
-cl_avr::st_Z$_Rr(t_mem code)
+cl_avr::st_ZS_Rr(t_mem code)
 { 
   t_addr z, r;
 
@@ -487,7 +487,7 @@ cl_avr::st_Z$_Rr(t_mem code)
  */
 
 int
-cl_avr::st_$Z_Rr(t_mem code)
+cl_avr::st_SZ_Rr(t_mem code)
 {
   t_addr z, r;
   t_mem data;
@@ -512,7 +512,7 @@ cl_avr::st_$Z_Rr(t_mem code)
  */
 
 int
-cl_avr::st_Y$_Rr(t_mem code)
+cl_avr::st_YS_Rr(t_mem code)
 {
   t_addr y, r;
 
@@ -536,7 +536,7 @@ cl_avr::st_Y$_Rr(t_mem code)
  */
 
 int
-cl_avr::st_$Y_Rr(t_mem code)
+cl_avr::st_SY_Rr(t_mem code)
 {
   t_addr y, r;
   t_mem data;
@@ -583,7 +583,7 @@ cl_avr::st_X_Rr(t_mem code)
  */
 
 int
-cl_avr::st_X$_Rr(t_mem code)
+cl_avr::st_XS_Rr(t_mem code)
 {
   t_addr x, r;
 
@@ -607,7 +607,7 @@ cl_avr::st_X$_Rr(t_mem code)
  */
 
 int
-cl_avr::st_$X_Rr(t_mem code)
+cl_avr::st_SX_Rr(t_mem code)
 {
   t_addr x, r;
   t_mem data;
diff --git a/sim/ucsim/s51.src/arith.cc b/sim/ucsim/s51.src/arith.cc
index 6fe2033b..15eb73d5 100644
--- a/sim/ucsim/s51.src/arith.cc
+++ b/sim/ucsim/s51.src/arith.cc
@@ -104,7 +104,7 @@ t_uc51::inst_rl(uchar code)
  */
 
 int
-t_uc51::inst_add_a_$data(uchar code)
+t_uc51::inst_add_a_Sdata(uchar code)
 {
   uchar data, ac;
   bool newC, newA, c6;
@@ -157,7 +157,7 @@ t_uc51::inst_add_a_addr(uchar code)
  */
 
 int
-t_uc51::inst_add_a_$ri(uchar code)
+t_uc51::inst_add_a_Sri(uchar code)
 {
   uchar data, ac;
   bool newC, newA, c6;
@@ -231,7 +231,7 @@ t_uc51::inst_rlc(uchar code)
  */
 
 int
-t_uc51::inst_addc_a_$data(uchar code)
+t_uc51::inst_addc_a_Sdata(uchar code)
 {
   uchar data, ac;
   bool orgC, newC, newA, c6;
@@ -284,7 +284,7 @@ t_uc51::inst_addc_a_addr(uchar code)
  */
 
 int
-t_uc51::inst_addc_a_$ri(uchar code)
+t_uc51::inst_addc_a_Sri(uchar code)
 {
   uchar data, ac;
   bool orgC, newC, newA, c6;
@@ -364,7 +364,7 @@ t_uc51::inst_div_ab(uchar code)
  */
 
 int
-t_uc51::inst_subb_a_$data(uchar code)
+t_uc51::inst_subb_a_Sdata(uchar code)
 {
   uchar data, ac, result, pw, c;
 
@@ -422,7 +422,7 @@ t_uc51::inst_subb_a_addr(uchar code)
  */
 
 int
-t_uc51::inst_subb_a_$ri(uchar code)
+t_uc51::inst_subb_a_Sri(uchar code)
 {
   uchar data, ac, result, pw, c;
   class cl_cell *cell;
diff --git a/sim/ucsim/s51.src/bit.cc b/sim/ucsim/s51.src/bit.cc
index 64b5222f..2b6cf83e 100644
--- a/sim/ucsim/s51.src/bit.cc
+++ b/sim/ucsim/s51.src/bit.cc
@@ -126,7 +126,7 @@ t_uc51::inst_mov_c_bit(uchar code)
  */
 
 int
-t_uc51::inst_anl_c_$bit(uchar code)
+t_uc51::inst_anl_c_Sbit(uchar code)
 {
   t_mem m;
   t_addr a;
diff --git a/sim/ucsim/s51.src/inc.cc b/sim/ucsim/s51.src/inc.cc
index 83e48ce9..d3391997 100644
--- a/sim/ucsim/s51.src/inc.cc
+++ b/sim/ucsim/s51.src/inc.cc
@@ -70,7 +70,7 @@ t_uc51::inst_inc_addr(uchar code)
  */
 
 int
-t_uc51::inst_inc_$ri(uchar code)
+t_uc51::inst_inc_Sri(uchar code)
 {
   class cl_cell *cell;
 
@@ -136,7 +136,7 @@ t_uc51::inst_dec_addr(uchar code)
  */
 
 int
-t_uc51::inst_dec_$ri(uchar code)
+t_uc51::inst_dec_Sri(uchar code)
 {
   class cl_cell *cell;
 
diff --git a/sim/ucsim/s51.src/jmp.cc b/sim/ucsim/s51.src/jmp.cc
index 74d6a960..285a746d 100644
--- a/sim/ucsim/s51.src/jmp.cc
+++ b/sim/ucsim/s51.src/jmp.cc
@@ -363,7 +363,7 @@ t_uc51::inst_jnz_addr(uchar code)
  */
 
 int
-t_uc51::inst_jmp_$a_dptr(uchar code)
+t_uc51::inst_jmp_Sa_dptr(uchar code)
 {
   PC= (sfr->read(DPH)*256 + sfr->read(DPL) + acc->read()) &
     (EROM_SIZE - 1);
@@ -396,7 +396,7 @@ t_uc51::inst_sjmp(uchar code)
  */
 
 int
-t_uc51::inst_cjne_a_$data_addr(uchar code)
+t_uc51::inst_cjne_a_Sdata_addr(uchar code)
 {
   uchar data, jaddr, ac;
 
@@ -441,7 +441,7 @@ t_uc51::inst_cjne_a_addr_addr(uchar code)
  */
 
 int
-t_uc51::inst_cjne_$ri_$data_addr(uchar code)
+t_uc51::inst_cjne_Sri_Sdata_addr(uchar code)
 {
   uchar data, jaddr;
   class cl_cell *cell;
@@ -465,7 +465,7 @@ t_uc51::inst_cjne_$ri_$data_addr(uchar code)
  */
 
 int
-t_uc51::inst_cjne_rn_$data_addr(uchar code)
+t_uc51::inst_cjne_rn_Sdata_addr(uchar code)
 {
   uchar data, jaddr;
   class cl_cell *reg;
diff --git a/sim/ucsim/s51.src/logic.cc b/sim/ucsim/s51.src/logic.cc
index b908912c..d7158110 100644
--- a/sim/ucsim/s51.src/logic.cc
+++ b/sim/ucsim/s51.src/logic.cc
@@ -59,7 +59,7 @@ t_uc51::inst_orl_addr_a(uchar code)
  */
 
 int
-t_uc51::inst_orl_addr_$data(uchar code)
+t_uc51::inst_orl_addr_Sdata(uchar code)
 {
   class cl_cell *cell;
   int res= resGO;
@@ -79,7 +79,7 @@ t_uc51::inst_orl_addr_$data(uchar code)
  */
 
 int
-t_uc51::inst_orl_a_$data(uchar code)
+t_uc51::inst_orl_a_Sdata(uchar code)
 {
   uchar d;
 
@@ -115,7 +115,7 @@ t_uc51::inst_orl_a_addr(uchar code)
  */
 
 int
-t_uc51::inst_orl_a_$ri(uchar code)
+t_uc51::inst_orl_a_Sri(uchar code)
 {
   t_mem d;
   class cl_cell *cell;
@@ -168,7 +168,7 @@ t_uc51::inst_anl_addr_a(uchar code)
  */
 
 int
-t_uc51::inst_anl_addr_$data(uchar code)
+t_uc51::inst_anl_addr_Sdata(uchar code)
 {
   class cl_cell *cell;
   t_mem d;
@@ -188,7 +188,7 @@ t_uc51::inst_anl_addr_$data(uchar code)
  */
 
 int
-t_uc51::inst_anl_a_$data(uchar code)
+t_uc51::inst_anl_a_Sdata(uchar code)
 {
   uchar d;
 
@@ -224,7 +224,7 @@ t_uc51::inst_anl_a_addr(uchar code)
  */
 
 int
-t_uc51::inst_anl_a_$ri(uchar code)
+t_uc51::inst_anl_a_Sri(uchar code)
 {
   t_mem d;
   class cl_cell *cell;
@@ -277,7 +277,7 @@ t_uc51::inst_xrl_addr_a(uchar code)
  */
 
 int
-t_uc51::inst_xrl_addr_$data(uchar code)
+t_uc51::inst_xrl_addr_Sdata(uchar code)
 {
   class cl_cell *cell;
 
@@ -295,7 +295,7 @@ t_uc51::inst_xrl_addr_$data(uchar code)
  */
 
 int
-t_uc51::inst_xrl_a_$data(uchar code)
+t_uc51::inst_xrl_a_Sdata(uchar code)
 {
   uchar d;
 
@@ -331,7 +331,7 @@ t_uc51::inst_xrl_a_addr(uchar code)
  */
 
 int
-t_uc51::inst_xrl_a_$ri(uchar code)
+t_uc51::inst_xrl_a_Sri(uchar code)
 {
   t_mem d;
   class cl_cell *cell;
diff --git a/sim/ucsim/s51.src/mov.cc b/sim/ucsim/s51.src/mov.cc
index a3240154..a8ae690b 100644
--- a/sim/ucsim/s51.src/mov.cc
+++ b/sim/ucsim/s51.src/mov.cc
@@ -49,7 +49,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  */
 
 int
-t_uc51::inst_mov_a_$data(uchar code)
+t_uc51::inst_mov_a_Sdata(uchar code)
 {
   acc->write(fetch());
   return(resGO);
@@ -63,7 +63,7 @@ t_uc51::inst_mov_a_$data(uchar code)
  */
 
 int
-t_uc51::inst_mov_addr_$data(uchar code)
+t_uc51::inst_mov_addr_Sdata(uchar code)
 {
   class cl_cell *cell;
 
@@ -81,7 +81,7 @@ t_uc51::inst_mov_addr_$data(uchar code)
  */
 
 int
-t_uc51::inst_mov_$ri_$data(uchar code)
+t_uc51::inst_mov_Sri_Sdata(uchar code)
 {
   class cl_cell *cell;
   
@@ -99,7 +99,7 @@ t_uc51::inst_mov_$ri_$data(uchar code)
  */
 
 int
-t_uc51::inst_mov_rn_$data(uchar code)
+t_uc51::inst_mov_rn_Sdata(uchar code)
 {
   class cl_cell *reg;
 
@@ -116,7 +116,7 @@ t_uc51::inst_mov_rn_$data(uchar code)
  */
 
 int
-t_uc51::inst_movc_a_$a_pc(uchar code)
+t_uc51::inst_movc_a_Sa_pc(uchar code)
 {
   acc->write(mem(MEM_ROM)->read(PC + acc->read()));
   tick(1);
@@ -151,7 +151,7 @@ t_uc51::inst_mov_addr_addr(uchar code)
  */
 
 int
-t_uc51::inst_mov_addr_$ri(uchar code)
+t_uc51::inst_mov_addr_Sri(uchar code)
 {
   class cl_cell *d, *s;
 
@@ -188,7 +188,7 @@ t_uc51::inst_mov_addr_rn(uchar code)
  */
 
 int
-t_uc51::inst_mov_dptr_$data(uchar code)
+t_uc51::inst_mov_dptr_Sdata(uchar code)
 {
   sfr->write(DPH, fetch());
   sfr->write(DPL, fetch());
@@ -204,7 +204,7 @@ t_uc51::inst_mov_dptr_$data(uchar code)
  */
 
 int
-t_uc51::inst_movc_a_$a_dptr(uchar code)
+t_uc51::inst_movc_a_Sa_dptr(uchar code)
 {
   acc->write(get_mem(MEM_ROM,
 		     sfr->read(DPH)*256+sfr->read(DPL) +
@@ -221,7 +221,7 @@ t_uc51::inst_movc_a_$a_dptr(uchar code)
  */
 
 int
-t_uc51::inst_mov_$ri_addr(uchar code)
+t_uc51::inst_mov_Sri_addr(uchar code)
 {
   class cl_cell *d, *s;
 
@@ -300,7 +300,7 @@ t_uc51::inst_xch_a_addr(uchar code)
  */
 
 int
-t_uc51::inst_xch_a_$ri(uchar code)
+t_uc51::inst_xch_a_Sri(uchar code)
 {
   t_mem temp;
   class cl_cell *cell;
@@ -361,7 +361,7 @@ t_uc51::inst_pop(uchar code)
  */
 
 int
-t_uc51::inst_xchd_a_$ri(uchar code)
+t_uc51::inst_xchd_a_Sri(uchar code)
 {
   t_mem temp, d;
   class cl_cell *cell;
@@ -381,7 +381,7 @@ t_uc51::inst_xchd_a_$ri(uchar code)
  */
 
 int
-t_uc51::inst_movx_a_$dptr(uchar code)
+t_uc51::inst_movx_a_Sdptr(uchar code)
 {
   acc->write(read_mem(MEM_XRAM,
 		      sfr->read(DPH)*256 + sfr->read(DPL)));
@@ -397,7 +397,7 @@ t_uc51::inst_movx_a_$dptr(uchar code)
  */
 
 int
-t_uc51::inst_movx_a_$ri(uchar code)
+t_uc51::inst_movx_a_Sri(uchar code)
 {
   t_mem d;
 
@@ -432,7 +432,7 @@ t_uc51::inst_mov_a_addr(uchar code)
  */
 
 int
-t_uc51::inst_mov_a_$ri(uchar code)
+t_uc51::inst_mov_a_Sri(uchar code)
 {
   class cl_cell *cell;
 
@@ -463,7 +463,7 @@ t_uc51::inst_mov_a_rn(uchar code)
  */
 
 int
-t_uc51::inst_movx_$dptr_a(uchar code)
+t_uc51::inst_movx_Sdptr_a(uchar code)
 {
   write_mem(MEM_XRAM, sfr->read(DPH)*256 + sfr->read(DPL), acc->read());
   tick(1);
@@ -478,7 +478,7 @@ t_uc51::inst_movx_$dptr_a(uchar code)
  */
 
 int
-t_uc51::inst_movx_$ri_a(uchar code)
+t_uc51::inst_movx_Sri_a(uchar code)
 {
   t_mem d;
 
@@ -513,7 +513,7 @@ t_uc51::inst_mov_addr_a(uchar code)
  */
 
 int
-t_uc51::inst_mov_$ri_a(uchar code)
+t_uc51::inst_mov_Sri_a(uchar code)
 {
   class cl_cell *cell;
 
diff --git a/sim/ucsim/s51.src/uc390.cc b/sim/ucsim/s51.src/uc390.cc
index 1fc5e2cb..80dda525 100644
--- a/sim/ucsim/s51.src/uc390.cc
+++ b/sim/ucsim/s51.src/uc390.cc
@@ -565,7 +565,7 @@ t_uc390::inst_inc_dptr (uchar code)
  */
 
 int
-t_uc390::inst_jmp_$a_dptr (uchar code)
+t_uc390::inst_jmp_Sa_dptr (uchar code)
 {
   uchar pl, ph, px, dps;
 
@@ -599,7 +599,7 @@ t_uc390::inst_jmp_$a_dptr (uchar code)
  */
 
 int
-t_uc390::inst_mov_dptr_$data (uchar code)
+t_uc390::inst_mov_dptr_Sdata (uchar code)
 {
   uchar pl, ph, px, dps;
 
@@ -637,7 +637,7 @@ t_uc390::inst_mov_dptr_$data (uchar code)
  */
 
 int
-t_uc390::inst_movc_a_$a_dptr (uchar code)
+t_uc390::inst_movc_a_Sa_dptr (uchar code)
 {
   uchar pl, ph, px, dps;
 
@@ -714,7 +714,7 @@ t_uc390::inst_pop (uchar code)
  */
 
 int
-t_uc390::inst_movx_a_$dptr (uchar code)
+t_uc390::inst_movx_a_Sdptr (uchar code)
 {
   uchar pl, ph, px, dps;
 
@@ -753,7 +753,7 @@ t_uc390::inst_movx_a_$dptr (uchar code)
  */
 
 int
-t_uc390::inst_movx_$dptr_a (uchar code)
+t_uc390::inst_movx_Sdptr_a (uchar code)
 {
   uchar pl, ph, px, dps;
 
diff --git a/sim/ucsim/s51.src/uc390cl.h b/sim/ucsim/s51.src/uc390cl.h
index d1bdf70d..a745263d 100644
--- a/sim/ucsim/s51.src/uc390cl.h
+++ b/sim/ucsim/s51.src/uc390cl.h
@@ -52,11 +52,11 @@ public:
 
   /* mods for dual-dptr */
   virtual int inst_inc_dptr(uchar code);
-  virtual int inst_jmp_$a_dptr(uchar code);
-  virtual int inst_mov_dptr_$data(uchar code);
-  virtual int inst_movc_a_$a_dptr(uchar code);
-  virtual int inst_movx_a_$dptr(uchar code);
-  virtual int inst_movx_$dptr_a(uchar code);
+  virtual int inst_jmp_Sa_dptr(uchar code);
+  virtual int inst_mov_dptr_Sdata(uchar code);
+  virtual int inst_movc_a_Sa_dptr(uchar code);
+  virtual int inst_movx_a_Sdptr(uchar code);
+  virtual int inst_movx_Sdptr_a(uchar code);
 
   /* mods for flat24 */
   virtual int inst_ajmp_addr(uchar code);
diff --git a/sim/ucsim/s51.src/uc51.cc b/sim/ucsim/s51.src/uc51.cc
index c44c7566..b00a87e0 100644
--- a/sim/ucsim/s51.src/uc51.cc
+++ b/sim/ucsim/s51.src/uc51.cc
@@ -628,7 +628,7 @@ t_uc51::exec_inst(void)
     case 0x03: res= inst_rr(code); break;
     case 0x04: res= inst_inc_a(code); break;
     case 0x05: res= inst_inc_addr(code); break;
-    case 0x06: case 0x07: res= inst_inc_$ri(code); break;
+    case 0x06: case 0x07: res= inst_inc_Sri(code); break;
     case 0x08: case 0x09: case 0x0a: case 0x0b:
     case 0x0c: case 0x0d: case 0x0e: case 0x0f: res= inst_inc_rn(code); break;
     case 0x10: res= inst_jbc_bit_addr(code); break;
@@ -638,94 +638,94 @@ t_uc51::exec_inst(void)
     case 0x13: res= inst_rrc(code); break;
     case 0x14: res= inst_dec_a(code); break;
     case 0x15: res= inst_dec_addr(code); break;
-    case 0x16: case 0x17: res= inst_dec_$ri(code); break;
+    case 0x16: case 0x17: res= inst_dec_Sri(code); break;
     case 0x18: case 0x19: case 0x1a: case 0x1b:
     case 0x1c: case 0x1d: case 0x1e: case 0x1f: res= inst_dec_rn(code); break;
     case 0x20: res= inst_jb_bit_addr(code); break;
     case 0x22: res= inst_ret(code); break;
     case 0x23: res= inst_rl(code); break;
-    case 0x24: res= inst_add_a_$data(code); break;
+    case 0x24: res= inst_add_a_Sdata(code); break;
     case 0x25: res= inst_add_a_addr(code); break;
-    case 0x26: case 0x27: res= inst_add_a_$ri(code); break;
+    case 0x26: case 0x27: res= inst_add_a_Sri(code); break;
     case 0x28: case 0x29: case 0x2a: case 0x2b:
     case 0x2c: case 0x2d: case 0x2e: case 0x2f:res= inst_add_a_rn(code);break;
     case 0x30: res= inst_jnb_bit_addr(code); break;
     case 0x32: res= inst_reti(code); break;
     case 0x33: res= inst_rlc(code); break;
-    case 0x34: res= inst_addc_a_$data(code); break;
+    case 0x34: res= inst_addc_a_Sdata(code); break;
     case 0x35: res= inst_addc_a_addr(code); break;
-    case 0x36: case 0x37: res= inst_addc_a_$ri(code); break;
+    case 0x36: case 0x37: res= inst_addc_a_Sri(code); break;
     case 0x38: case 0x39: case 0x3a: case 0x3b:
     case 0x3c: case 0x3d: case 0x3e: case 0x3f:res= inst_addc_a_rn(code);break;
     case 0x40: res= inst_jc_addr(code); break;
     case 0x42: res= inst_orl_addr_a(code); break;
-    case 0x43: res= inst_orl_addr_$data(code); break;
-    case 0x44: res= inst_orl_a_$data(code); break;
+    case 0x43: res= inst_orl_addr_Sdata(code); break;
+    case 0x44: res= inst_orl_a_Sdata(code); break;
     case 0x45: res= inst_orl_a_addr(code); break;
-    case 0x46: case 0x47: res= inst_orl_a_$ri(code); break;
+    case 0x46: case 0x47: res= inst_orl_a_Sri(code); break;
     case 0x48: case 0x49: case 0x4a: case 0x4b:
     case 0x4c: case 0x4d: case 0x4e: case 0x4f: res= inst_orl_a_rn(code);break;
     case 0x50: res= inst_jnc_addr(code); break;
     case 0x52: res= inst_anl_addr_a(code); break;
-    case 0x53: res= inst_anl_addr_$data(code); break;
-    case 0x54: res= inst_anl_a_$data(code); break;
+    case 0x53: res= inst_anl_addr_Sdata(code); break;
+    case 0x54: res= inst_anl_a_Sdata(code); break;
     case 0x55: res= inst_anl_a_addr(code); break;
-    case 0x56: case 0x57: res= inst_anl_a_$ri(code); break;
+    case 0x56: case 0x57: res= inst_anl_a_Sri(code); break;
     case 0x58: case 0x59: case 0x5a: case 0x5b:
     case 0x5c: case 0x5d: case 0x5e: case 0x5f: res= inst_anl_a_rn(code);break;
     case 0x60: res= inst_jz_addr(code); break;
     case 0x62: res= inst_xrl_addr_a(code); break;
-    case 0x63: res= inst_xrl_addr_$data(code); break;
-    case 0x64: res= inst_xrl_a_$data(code); break;
+    case 0x63: res= inst_xrl_addr_Sdata(code); break;
+    case 0x64: res= inst_xrl_a_Sdata(code); break;
     case 0x65: res= inst_xrl_a_addr(code); break;
-    case 0x66: case 0x67: res= inst_xrl_a_$ri(code); break;
+    case 0x66: case 0x67: res= inst_xrl_a_Sri(code); break;
     case 0x68: case 0x69: case 0x6a: case 0x6b:
     case 0x6c: case 0x6d: case 0x6e: case 0x6f: res= inst_xrl_a_rn(code);break;
     case 0x70: res= inst_jnz_addr(code); break;
     case 0x72: res= inst_orl_c_bit(code); break;
-    case 0x73: res= inst_jmp_$a_dptr(code); break;
-    case 0x74: res= inst_mov_a_$data(code); break;
-    case 0x75: res= inst_mov_addr_$data(code); break;
-    case 0x76: case 0x77: res= inst_mov_$ri_$data(code); break;
+    case 0x73: res= inst_jmp_Sa_dptr(code); break;
+    case 0x74: res= inst_mov_a_Sdata(code); break;
+    case 0x75: res= inst_mov_addr_Sdata(code); break;
+    case 0x76: case 0x77: res= inst_mov_Sri_Sdata(code); break;
     case 0x78: case 0x79: case 0x7a: case 0x7b: case 0x7c:
-    case 0x7d: case 0x7e: case 0x7f: res=inst_mov_rn_$data(code); break;
+    case 0x7d: case 0x7e: case 0x7f: res=inst_mov_rn_Sdata(code); break;
     case 0x80: res= inst_sjmp(code); break;
     case 0x82: res= inst_anl_c_bit(code); break;
-    case 0x83: res= inst_movc_a_$a_pc(code); break;
+    case 0x83: res= inst_movc_a_Sa_pc(code); break;
     case 0x84: res= inst_div_ab(code); break;
     case 0x85: res= inst_mov_addr_addr(code); break;
-    case 0x86: case 0x87: res= inst_mov_addr_$ri(code); break;
+    case 0x86: case 0x87: res= inst_mov_addr_Sri(code); break;
     case 0x88: case 0x89: case 0x8a: case 0x8b:
     case 0x8c: case 0x8d: case 0x8e: case 0x8f:res=inst_mov_addr_rn(code);break;
-    case 0x90: res= inst_mov_dptr_$data(code); break;
+    case 0x90: res= inst_mov_dptr_Sdata(code); break;
     case 0x92: res= inst_mov_bit_c(code); break;
-    case 0x93: res= inst_movc_a_$a_dptr(code); break;
-    case 0x94: res= inst_subb_a_$data(code); break;
+    case 0x93: res= inst_movc_a_Sa_dptr(code); break;
+    case 0x94: res= inst_subb_a_Sdata(code); break;
     case 0x95: res= inst_subb_a_addr(code); break;
-    case 0x96: case 0x97: res= inst_subb_a_$ri(code); break;
+    case 0x96: case 0x97: res= inst_subb_a_Sri(code); break;
     case 0x98: case 0x99: case 0x9a: case 0x9b:
     case 0x9c: case 0x9d: case 0x9e: case 0x9f:res= inst_subb_a_rn(code);break;
     case 0xa2: res= inst_mov_c_bit(code); break;
     case 0xa3: res= inst_inc_dptr(code); break;
     case 0xa4: res= inst_mul_ab(code); break;
     case 0xa5: res= inst_unknown(code); break;
-    case 0xa6: case 0xa7: res= inst_mov_$ri_addr(code); break;
+    case 0xa6: case 0xa7: res= inst_mov_Sri_addr(code); break;
     case 0xa8: case 0xa9: case 0xaa: case 0xab:
     case 0xac: case 0xad: case 0xae: case 0xaf:res=inst_mov_rn_addr(code);break;
-    case 0xb0: res= inst_anl_c_$bit(code); break;
+    case 0xb0: res= inst_anl_c_Sbit(code); break;
     case 0xb2: res= inst_cpl_bit(code); break;
     case 0xb3: res= inst_cpl_c(code); break;
-    case 0xb4: res= inst_cjne_a_$data_addr(code); break;
+    case 0xb4: res= inst_cjne_a_Sdata_addr(code); break;
     case 0xb5: res= inst_cjne_a_addr_addr(code); break;
-    case 0xb6: case 0xb7: res= inst_cjne_$ri_$data_addr(code); break;
+    case 0xb6: case 0xb7: res= inst_cjne_Sri_Sdata_addr(code); break;
     case 0xb8: case 0xb9: case 0xba: case 0xbb: case 0xbc:
-    case 0xbd: case 0xbe: case 0xbf: res=inst_cjne_rn_$data_addr(code); break;
+    case 0xbd: case 0xbe: case 0xbf: res=inst_cjne_rn_Sdata_addr(code); break;
     case 0xc0: res= inst_push(code); break;
     case 0xc2: res= inst_clr_bit(code); break;
     case 0xc3: res= inst_clr_c(code); break;
     case 0xc4: res= inst_swap(code); break;
     case 0xc5: res= inst_xch_a_addr(code); break;
-    case 0xc6: case 0xc7: res= inst_xch_a_$ri(code); break;
+    case 0xc6: case 0xc7: res= inst_xch_a_Sri(code); break;
     case 0xc8: case 0xc9: case 0xca: case 0xcb:
     case 0xcc: case 0xcd: case 0xce: case 0xcf: res= inst_xch_a_rn(code);break;
     case 0xd0: res= inst_pop(code); break;
@@ -733,21 +733,21 @@ t_uc51::exec_inst(void)
     case 0xd3: res= inst_setb_c(code); break;
     case 0xd4: res= inst_da_a(code); break;
     case 0xd5: res= inst_djnz_addr_addr(code); break;
-    case 0xd6: case 0xd7: res= inst_xchd_a_$ri(code); break;
+    case 0xd6: case 0xd7: res= inst_xchd_a_Sri(code); break;
     case 0xd8: case 0xd9: case 0xda: case 0xdb: case 0xdc:
     case 0xdd: case 0xde: case 0xdf: res=inst_djnz_rn_addr(code); break;
-    case 0xe0: res= inst_movx_a_$dptr(code); break;
-    case 0xe2: case 0xe3: res= inst_movx_a_$ri(code); break;
+    case 0xe0: res= inst_movx_a_Sdptr(code); break;
+    case 0xe2: case 0xe3: res= inst_movx_a_Sri(code); break;
     case 0xe4: res= inst_clr_a(code); break;
     case 0xe5: res= inst_mov_a_addr(code); break;
-    case 0xe6: case 0xe7: res= inst_mov_a_$ri(code); break;
+    case 0xe6: case 0xe7: res= inst_mov_a_Sri(code); break;
     case 0xe8: case 0xe9: case 0xea: case 0xeb:
     case 0xec: case 0xed: case 0xee: case 0xef: res= inst_mov_a_rn(code);break;
-    case 0xf0: res= inst_movx_$dptr_a(code); break;
-    case 0xf2: case 0xf3: res= inst_movx_$ri_a(code); break;
+    case 0xf0: res= inst_movx_Sdptr_a(code); break;
+    case 0xf2: case 0xf3: res= inst_movx_Sri_a(code); break;
     case 0xf4: res= inst_cpl_a(code); break;
     case 0xf5: res= inst_mov_addr_a(code); break;
-    case 0xf6: case 0xf7: res= inst_mov_$ri_a(code); break;
+    case 0xf6: case 0xf7: res= inst_mov_Sri_a(code); break;
     case 0xf8: case 0xf9: case 0xfa: case 0xfb:
     case 0xfc: case 0xfd: case 0xfe: case 0xff: res= inst_mov_rn_a(code);break;
     default:
diff --git a/sim/ucsim/s51.src/uc51cl.h b/sim/ucsim/s51.src/uc51cl.h
index 01ff7fbb..17f8bea3 100644
--- a/sim/ucsim/s51.src/uc51cl.h
+++ b/sim/ucsim/s51.src/uc51cl.h
@@ -113,7 +113,7 @@ protected:
   virtual int inst_rr(uchar code);			/* 03 */
   virtual int inst_inc_a(uchar code);			/* 04 */
   virtual int inst_inc_addr(uchar code);		/* 05 */
-  virtual int inst_inc_$ri(uchar code);			/* 06,07 */
+  virtual int inst_inc_Sri(uchar code);			/* 06,07 */
   virtual int inst_inc_rn(uchar code);			/* 08-0f */
   virtual int inst_jbc_bit_addr(uchar code);		/* 10 */
   virtual int inst_acall_addr(uchar code);		/* [13579bdf]1 */
@@ -121,101 +121,101 @@ protected:
   virtual int inst_rrc(uchar code);			/* 13 */
   virtual int inst_dec_a(uchar code);			/* 14 */
   virtual int inst_dec_addr(uchar code);		/* 15 */
-  virtual int inst_dec_$ri(uchar code);			/* 16,17 */
+  virtual int inst_dec_Sri(uchar code);			/* 16,17 */
   virtual int inst_dec_rn(uchar code);			/* 18-1f */
   virtual int inst_jb_bit_addr(uchar code);		/* 20 */
   virtual int inst_ret(uchar code);			/* 22 */
   virtual int inst_rl(uchar code);			/* 23 */
-  virtual int inst_add_a_$data(uchar code);		/* 24 */
+  virtual int inst_add_a_Sdata(uchar code);		/* 24 */
   virtual int inst_add_a_addr(uchar code);		/* 25 */
-  virtual int inst_add_a_$ri(uchar code);		/* 26,27 */
+  virtual int inst_add_a_Sri(uchar code);		/* 26,27 */
   virtual int inst_add_a_rn(uchar code);		/* 28-2f */
   virtual int inst_jnb_bit_addr(uchar code);		/* 30 */
   virtual int inst_reti(uchar code);			/* 32 */
   virtual int inst_rlc(uchar code);			/* 33 */
-  virtual int inst_addc_a_$data(uchar code);		/* 34 */
+  virtual int inst_addc_a_Sdata(uchar code);		/* 34 */
   virtual int inst_addc_a_addr(uchar code);		/* 35 */
-  virtual int inst_addc_a_$ri(uchar code);		/* 36,37 */
+  virtual int inst_addc_a_Sri(uchar code);		/* 36,37 */
   virtual int inst_addc_a_rn(uchar code);		/* 38-3f */
   virtual int inst_jc_addr(uchar code);			/* 40 */
   virtual int inst_orl_addr_a(uchar code);		/* 42 */
-  virtual int inst_orl_addr_$data(uchar code);		/* 43 */
-  virtual int inst_orl_a_$data(uchar code);		/* 44 */
+  virtual int inst_orl_addr_Sdata(uchar code);		/* 43 */
+  virtual int inst_orl_a_Sdata(uchar code);		/* 44 */
   virtual int inst_orl_a_addr(uchar code);		/* 45 */
-  virtual int inst_orl_a_$ri(uchar code);		/* 46,47 */
+  virtual int inst_orl_a_Sri(uchar code);		/* 46,47 */
   virtual int inst_orl_a_rn(uchar code);		/* 48-4f */
   virtual int inst_jnc_addr(uchar code);		/* 50 */
   virtual int inst_anl_addr_a(uchar code);		/* 52 */
-  virtual int inst_anl_addr_$data(uchar code);		/* 53 */
-  virtual int inst_anl_a_$data(uchar code);		/* 54 */
+  virtual int inst_anl_addr_Sdata(uchar code);		/* 53 */
+  virtual int inst_anl_a_Sdata(uchar code);		/* 54 */
   virtual int inst_anl_a_addr(uchar code);		/* 55 */
-  virtual int inst_anl_a_$ri(uchar code);		/* 56,57 */
+  virtual int inst_anl_a_Sri(uchar code);		/* 56,57 */
   virtual int inst_anl_a_rn(uchar code);		/* 58-5f */
   virtual int inst_jz_addr(uchar code);			/* 60 */
   virtual int inst_xrl_addr_a(uchar code);		/* 62 */
-  virtual int inst_xrl_addr_$data(uchar code);		/* 63 */
-  virtual int inst_xrl_a_$data(uchar code);		/* 64 */
+  virtual int inst_xrl_addr_Sdata(uchar code);		/* 63 */
+  virtual int inst_xrl_a_Sdata(uchar code);		/* 64 */
   virtual int inst_xrl_a_addr(uchar code);		/* 65 */
-  virtual int inst_xrl_a_$ri(uchar code);		/* 66,67 */
+  virtual int inst_xrl_a_Sri(uchar code);		/* 66,67 */
   virtual int inst_xrl_a_rn(uchar code);		/* 68-6f */
   virtual int inst_jnz_addr(uchar code);		/* 70 */
   virtual int inst_orl_c_bit(uchar code);		/* 72 */
-  virtual int inst_jmp_$a_dptr(uchar code);		/* 73 */
-  virtual int inst_mov_a_$data(uchar code);		/* 74 */
-  virtual int inst_mov_addr_$data(uchar code);		/* 75 */
-  virtual int inst_mov_$ri_$data(uchar code);		/* 76,77 */
-  virtual int inst_mov_rn_$data(uchar code);		/* 78-7f */
+  virtual int inst_jmp_Sa_dptr(uchar code);		/* 73 */
+  virtual int inst_mov_a_Sdata(uchar code);		/* 74 */
+  virtual int inst_mov_addr_Sdata(uchar code);		/* 75 */
+  virtual int inst_mov_Sri_Sdata(uchar code);		/* 76,77 */
+  virtual int inst_mov_rn_Sdata(uchar code);		/* 78-7f */
   virtual int inst_sjmp(uchar code);			/* 80 */
   virtual int inst_anl_c_bit(uchar code);		/* 82 */
-  virtual int inst_movc_a_$a_pc(uchar code);		/* 83 */
+  virtual int inst_movc_a_Sa_pc(uchar code);		/* 83 */
   virtual int inst_div_ab(uchar code);			/* 84 */
   virtual int inst_mov_addr_addr(uchar code);		/* 85 */
-  virtual int inst_mov_addr_$ri(uchar code);		/* 86,87 */
+  virtual int inst_mov_addr_Sri(uchar code);		/* 86,87 */
   virtual int inst_mov_addr_rn(uchar code);		/* 88-8f */
-  virtual int inst_mov_dptr_$data(uchar code);		/* 90 */
+  virtual int inst_mov_dptr_Sdata(uchar code);		/* 90 */
   virtual int inst_mov_bit_c(uchar code);		/* 92 */
-  virtual int inst_movc_a_$a_dptr(uchar code);		/* 93 */
-  virtual int inst_subb_a_$data(uchar code);		/* 94 */
+  virtual int inst_movc_a_Sa_dptr(uchar code);		/* 93 */
+  virtual int inst_subb_a_Sdata(uchar code);		/* 94 */
   virtual int inst_subb_a_addr(uchar code);		/* 95 */
-  virtual int inst_subb_a_$ri(uchar code);		/* 96,97 */
+  virtual int inst_subb_a_Sri(uchar code);		/* 96,97 */
   virtual int inst_subb_a_rn(uchar code);		/* 98-9f */
   virtual int inst_mov_c_bit(uchar code);		/* a2 */
   virtual int inst_inc_dptr(uchar code);		/* a3 */
   virtual int inst_mul_ab(uchar code);			/* a4 */
-  virtual int inst_mov_$ri_addr(uchar code);		/* a6,a7 */
+  virtual int inst_mov_Sri_addr(uchar code);		/* a6,a7 */
   virtual int inst_mov_rn_addr(uchar code);		/* a8-af */
-  virtual int inst_anl_c_$bit(uchar code);		/* b0 */
+  virtual int inst_anl_c_Sbit(uchar code);		/* b0 */
   virtual int inst_cpl_bit(uchar code);			/* b2 */
   virtual int inst_cpl_c(uchar code);			/* b3 */
-  virtual int inst_cjne_a_$data_addr(uchar code);	/* b4 */
+  virtual int inst_cjne_a_Sdata_addr(uchar code);	/* b4 */
   virtual int inst_cjne_a_addr_addr(uchar code);	/* b5 */
-  virtual int inst_cjne_$ri_$data_addr(uchar code);	/* b6,b7 */
-  virtual int inst_cjne_rn_$data_addr(uchar code);	/* b8-bf */
+  virtual int inst_cjne_Sri_Sdata_addr(uchar code);	/* b6,b7 */
+  virtual int inst_cjne_rn_Sdata_addr(uchar code);	/* b8-bf */
   virtual int inst_push(uchar code);			/* c0 */
   virtual int inst_clr_bit(uchar code);			/* c2 */
   virtual int inst_clr_c(uchar code);			/* c3*/
   virtual int inst_swap(uchar code);			/* c4 */
   virtual int inst_xch_a_addr(uchar code);		/* c5 */
-  virtual int inst_xch_a_$ri(uchar code);		/* c6,c7 */
+  virtual int inst_xch_a_Sri(uchar code);		/* c6,c7 */
   virtual int inst_xch_a_rn(uchar code);		/* c8-cf */
   virtual int inst_pop(uchar code);			/* d0 */
   virtual int inst_setb_bit(uchar code);		/* d2 */
   virtual int inst_setb_c(uchar code);			/* d3 */
   virtual int inst_da_a(uchar code);			/* d4 */
   virtual int inst_djnz_addr_addr(uchar code);		/* d5 */
-  virtual int inst_xchd_a_$ri(uchar code);		/* d6,d7 */
+  virtual int inst_xchd_a_Sri(uchar code);		/* d6,d7 */
   virtual int inst_djnz_rn_addr(uchar code);		/* d8-df */
-  virtual int inst_movx_a_$dptr(uchar code);		/* e0 */
-  virtual int inst_movx_a_$ri(uchar code);		/* e2,e3 */
+  virtual int inst_movx_a_Sdptr(uchar code);		/* e0 */
+  virtual int inst_movx_a_Sri(uchar code);		/* e2,e3 */
   virtual int inst_clr_a(uchar code);			/* e4 */
   virtual int inst_mov_a_addr(uchar code);		/* e5 */
-  virtual int inst_mov_a_$ri(uchar code);		/* e6,e7 */
+  virtual int inst_mov_a_Sri(uchar code);		/* e6,e7 */
   virtual int inst_mov_a_rn(uchar code);		/* e8-ef */
-  virtual int inst_movx_$dptr_a(uchar code);		/* f0 */
-  virtual int inst_movx_$ri_a(uchar code);		/* f2,f3 */
+  virtual int inst_movx_Sdptr_a(uchar code);		/* f0 */
+  virtual int inst_movx_Sri_a(uchar code);		/* f2,f3 */
   virtual int inst_cpl_a(uchar code);			/* f4 */
   virtual int inst_mov_addr_a(uchar code);		/* f5 */
-  virtual int inst_mov_$ri_a(uchar code);		/* f6,f7 */
+  virtual int inst_mov_Sri_a(uchar code);		/* f6,f7 */
   virtual int inst_mov_rn_a(uchar code);		/* f8-ff */
 };
 
diff --git a/sim/ucsim/s51.src/uc51r.cc b/sim/ucsim/s51.src/uc51r.cc
index 44a2c995..117c455e 100644
--- a/sim/ucsim/s51.src/uc51r.cc
+++ b/sim/ucsim/s51.src/uc51r.cc
@@ -131,7 +131,7 @@ t_uc51r::received(int c)
  */
 
 int
-t_uc51r::inst_movx_a_$dptr(uchar code)
+t_uc51r::inst_movx_a_Sdptr(uchar code)
 {
   if ((sfr->get(AUXR) & bmEXTRAM) ||
       sfr->get(DPH))
@@ -152,7 +152,7 @@ t_uc51r::inst_movx_a_$dptr(uchar code)
  */
 
 int
-t_uc51r::inst_movx_a_$ri(uchar code)
+t_uc51r::inst_movx_a_Sri(uchar code)
 {
   class cl_cell *cell;
   t_mem d= 0;
@@ -175,7 +175,7 @@ t_uc51r::inst_movx_a_$ri(uchar code)
  */
 
 int
-t_uc51r::inst_movx_$dptr_a(uchar code)
+t_uc51r::inst_movx_Sdptr_a(uchar code)
 {
   if ((sfr->get(AUXR) & bmEXTRAM) ||
       sfr->get(DPH))
@@ -193,7 +193,7 @@ t_uc51r::inst_movx_$dptr_a(uchar code)
  */
 
 int
-t_uc51r::inst_movx_$ri_a(uchar code)
+t_uc51r::inst_movx_Sri_a(uchar code)
 {
   class cl_cell *cell;
   t_mem d= 0;
diff --git a/sim/ucsim/s51.src/uc51rcl.h b/sim/ucsim/s51.src/uc51rcl.h
index 210750e5..9fa378d8 100644
--- a/sim/ucsim/s51.src/uc51rcl.h
+++ b/sim/ucsim/s51.src/uc51rcl.h
@@ -55,10 +55,10 @@ public:
 
   virtual void received(int c);
 
-  virtual int inst_movx_a_$dptr(uchar code);		/* e0 */
-  virtual int inst_movx_a_$ri(uchar code);		/* e2,e3 */
-  virtual int inst_movx_$dptr_a(uchar code);		/* f0 */
-  virtual int inst_movx_$ri_a(uchar code);		/* f2,f3 */
+  virtual int inst_movx_a_Sdptr(uchar code);		/* e0 */
+  virtual int inst_movx_a_Sri(uchar code);		/* e2,e3 */
+  virtual int inst_movx_Sdptr_a(uchar code);		/* f0 */
+  virtual int inst_movx_Sri_a(uchar code);		/* f2,f3 */
 };