[Desmume-cvs] desmume/src Disassembler.cpp,1.4,1.5 Disassembler.hpp,1.2,1.3

[Theo B. <cyb...@us...>]

Update of /cvsroot/desmume/desmume/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6698

Modified Files:
	Disassembler.cpp Disassembler.hpp 
Log Message:
-Changed variable types so they're more portable

Index: Disassembler.hpp
===================================================================
RCS file: /cvsroot/desmume/desmume/src/Disassembler.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Disassembler.hpp	6 Apr 2006 19:10:03 -0000	1.2
+++ Disassembler.hpp	12 Apr 2006 20:21:00 -0000	1.3
@@ -19,13 +19,13 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef DESASSEMBLEUR_H
-#define DESASSEMBLEUR_H
+#ifndef DISASSEMBLER_H
+#define DISASSEMBLER_H
 
 #include "types.h"
 
-extern char * (* des_arm_instructions_set[4096])(unsigned long adr, unsigned long i, char * txt);
-extern char * (* des_thumb_instructions_set[1024])(unsigned long adr, unsigned long i, char * txt);
+extern char * (* des_arm_instructions_set[4096])(u32 adr, u32 i, char * txt);
+extern char * (* des_thumb_instructions_set[1024])(u32 adr, u32 i, char * txt);
 
 #endif
 

Index: Disassembler.cpp
===================================================================
RCS file: /cvsroot/desmume/desmume/src/Disassembler.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Disassembler.cpp	7 Apr 2006 19:20:51 -0000	1.4
+++ Disassembler.cpp	12 Apr 2006 20:21:00 -0000	1.5
@@ -25,7 +25,7 @@
 #include "armcpu.h"
 #include "MMU.hpp"
 
-#define ROR(i, j)   ((((unsigned long)(i))>>(j)) | (((unsigned long)(i))<<(32-(j))))
+#define ROR(i, j)   ((((u32)(i))>>(j)) | (((u32)(i))<<(32-(j))))
 
 const char Condition[16][3] = {
       "EQ",
@@ -130,7 +130,7 @@
                                      (int)((i>>7)&0x1F)\
                                      );
[...3966 lines suppressed...]
 {
      part = adr+4 + (SIGNEEXT_IMM11(i)<<12);
      sprintf(txt, "CALCUL LA PARTIE HAUTE DE L'ADRESSE");
@@ -3675,14 +3675,14 @@
 
 }
 
-char * OP_BL_THUMB(unsigned long adr, unsigned long i, char * txt)
+char * OP_BL_THUMB(u32 adr, u32 i, char * txt)
 {
      sprintf(txt, "BL #%X", (int)(part + ((i&0x7FF)<<1))&0xFFFFFFFC);
      return txt;
 } 
 
 #define TYPE_RETOUR char *
-#define PARAMETRES  unsigned long adr, unsigned long i, char * txt
+#define PARAMETRES  u32 adr, u32 i, char * txt
 #define CALLTYPE     
 #define NOM_TAB     des_arm_instructions_set
 #define NOM_THUMB_TAB     des_thumb_instructions_set