Minor compilation fixes for ppcd

FrodeSolheim · Sep 14, 2014 · 09ebf8f · 09ebf8f
1 parent f7a4821
commit 09ebf8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/ppc/ppcd.cpp b/src/ppc/ppcd.cpp
@@ -388,7 +388,7 @@ static void bcx(int Disp, int L)
     if(Disp)
     {
         bd = DIS_UIMM & ~3;
-        if(bd & 0x8000) bd |= 0xffffffffffff0000;
+        if(bd & 0x8000) bd |= 0xffffffffffff0000LL;
         o->target = (AA ? 0 : DIS_PC) + bd;
     }
     else o->target = 0;
@@ -451,9 +451,9 @@ static void bx(void)
 {
     // Calculate displacement and target address
     u64 bd = Instr & 0x03fffffc;
-    if(bd & 0x02000000) bd |= 0xfffffffffc000000;
+    if(bd & 0x02000000) bd |= 0xfffffffffc000000LL;
     o->target = (AA ? 0 : DIS_PC) + bd;
- 
+
     o->iclass |= PPC_DISA_BRANCH;
     sprintf(o->mnemonic, "b%s", b_opt[AALK]);
     place_target(o->operands, 0);
@@ -1773,6 +1773,6 @@ char *PPCDisasmSimple(u64 pc, u32 instr)
     dis_out.instr = instr;
 
     PPCDisasm(&dis_out);
-    sprintf(output, "%08X  %08X  %-10s %s", pc, instr, dis_out.mnemonic, dis_out.operands);
+    sprintf(output, "%08llX  %08X  %-10s %s", pc, instr, dis_out.mnemonic, dis_out.operands);
     return output;
 }
diff --git a/src/ppc/ppcd.h b/src/ppc/ppcd.h
@@ -6,10 +6,10 @@
 
 typedef signed   char       s8;
 typedef signed   short      s16;
-typedef signed   long       s32;
+typedef signed   int        s32;
 typedef unsigned char       u8;
 typedef unsigned short      u16;
-typedef unsigned long       u32;
+typedef unsigned int        u32;
 typedef float               f32;
 typedef double              f64;