[ros-diffs] [greatlrd] 25553: fixing a small disambler bug for mr

[greatlrd at svn.reactos.org]

Author: greatlrd
Date: Sun Jan 21 18:06:57 2007
New Revision: 25553

URL: http://svn.reactos.org/svn/reactos?rev=25553&view=rev
Log:
fixing a small disambler bug for mr 

Modified:
    trunk/rosapps/devutils/cputointel/CpuToIntel.c
    trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h
    trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c

Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/CpuToIntel.c?rev=25553&r1=25552&r2=25553&view=diff
==============================================================================
--- trunk/rosapps/devutils/cputointel/CpuToIntel.c (original)
+++ trunk/rosapps/devutils/cputointel/CpuToIntel.c Sun Jan 21 18:06:57 2007
@@ -98,9 +98,11 @@
     //                                                    mode 1 convert to intel 
     //                                                    mode 2 convert to ppc
     //return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type, mode);
-   return LoadPFileImage("e:\\testppc.exe","e:\\cputointel.asm",0,0,0,1); 
+   LoadPFileImage("e:\\testppc.exe","e:\\cputoppc.asm",0,0,0,1); 
+   LoadPFileImage("e:\\testppc.exe","e:\\cputointel.asm",0,0,0,2); 
+
    // return LoadPFileImage("e:\\testms.exe","e:\\cputointel.asm",0,0,0,1); // convert
-
+  return 0;
 }
 
 

Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h?rev=25553&r1=25552&r2=25553&view=diff
==============================================================================
--- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h (original)
+++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h Sun Jan 21 18:06:57 2007
@@ -15,6 +15,19 @@
 CPU_BYTE cpuPPCInit_stw[32]  =  {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,0,2,2};
 CPU_BYTE cpuPPCInit_stwu[32]  = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,1,2,2};
 CPU_BYTE cpuPPCInit_mr[32]  =   {0,1,1,1,1,0,0,0,0,0,0,0,1,0,1,1,2,2,2,2,2,2,2,2,0,1,1,1,1,1,2,2};
+
+
+/*  
+CPU_BYTE cpuPPCInit_stw[32]  =  {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,0,2,2};
+CPU_BYTE cpuPPCInit_stwu[32]  = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,1,2,2};
+CPU_BYTE cpuPPCInit_mr[32]  =   {0,1,1,1,1,0,0,0,0,0,0,0,1,0,1,1,2,2,2,2,2,2,2,2,0,1,1,1,1,1,2,2};
+
+00: 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,1,2,2 stwu r1,-32(r1)
+04: 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,0,2,2 stw r31,28(r1)
+08: 0,1,1,1,1,0,0,0,0,0,0,0,1,0,1,1,2,2,2,2,2,2,2,2,0,1,1,1,1,1,2,2 mr r31,r1
+0c: 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,0,2,2 stw r3,8(r31)
+10: 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,0,0,0,2,2 lwz r9,8(r31)
+*/
 /* mask */
 /*
  * no mask  we implement function getting the reg right 

Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c?rev=25553&r1=25552&r2=25553&view=diff
==============================================================================
--- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original)
+++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Sun Jan 21 18:06:57 2007
@@ -110,7 +110,7 @@
         return -1;
     }
     pMyBrainAnalys->op = OP_ANY_mov;
-    pMyBrainAnalys->type= 2 + 8 + 16; /* 8 dst reg, 2 src reg */
+    pMyBrainAnalys->type= 2 + 8; /* 8 dst reg, 2 src reg */
     pMyBrainAnalys->src_size = 32;
     pMyBrainAnalys->src = PPC_GetBitArraySrcReg(opcode);
     pMyBrainAnalys->dst = PPC_GetBitArrayBto31xx(opcode);