X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjagdasm.cpp;h=6fadae8a03694f755b2f81cea40718e202254f70;hb=b74298f2a4540168f8e4a2bbc9fc6fdc7f4afa57;hp=f6eb5ee81f1d91e40e5564b6926c2156a856be2d;hpb=66aa58a9416cdfbe3a999e4f2672627d4f9b1f59;p=virtualjaguar

diff --git a/src/jagdasm.cpp b/src/jagdasm.cpp
index f6eb5ee..6fadae8 100644
--- a/src/jagdasm.cpp
+++ b/src/jagdasm.cpp
@@ -1,3 +1,6 @@
+#include "jagdasm.h"
+
+#include <stdio.h>
 #include "jaguar.h"
 
 #define ROPCODE(a) JaguarReadWord(a)
@@ -5,7 +8,7 @@
 uint8 convert_zero[32] =
 { 32,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31 };
 
-char * condition[32] =
+const char * condition[32] =
 {
 	"",
 	"nz,",
@@ -46,7 +49,7 @@ char * condition[32] =
 	
 
 
-char * signed_16bit(INT16 val)
+char * signed_16bit(int16 val)
 {
 	static char temp[10];
 
@@ -99,7 +102,7 @@ unsigned dasmjag(int dsp_type, char * buffer, unsigned pc)
 		case 28:	sprintf(buffer, "ROR     R%02d,R%02d", reg1, reg2);					break;
 		case 29:	sprintf(buffer, "RORQ    $%X,R%02d", convert_zero[reg1], reg2);	break;
 		case 30:	sprintf(buffer, "CMP     R%02d,R%02d", reg1, reg2);					break;
-		case 31:	sprintf(buffer, "CMPQ    %s,R%02d", signed_16bit((INT16)(reg1 << 11) >> 11), reg2);break;
+		case 31:	sprintf(buffer, "CMPQ    %s,R%02d", signed_16bit((int16)(reg1 << 11) >> 11), reg2);break;
 		case 32:	if (dsp_type == JAGUAR_GPU)
 						sprintf(buffer, "SAT8    R%02d", reg2);
 					else
@@ -137,7 +140,7 @@ unsigned dasmjag(int dsp_type, char * buffer, unsigned pc)
 		case 50:	sprintf(buffer, "STORE   R%02d,(R15+$%X)", reg2, convert_zero[reg1]*4);break;
 		case 51:	sprintf(buffer, "MOVE    PC,R%02d", reg2);							break;
 		case 52:	sprintf(buffer, "JUMP    %s(R%02d)", condition[reg2], reg1);			break;
-		case 53:	sprintf(buffer, "JR      %s%08X", condition[reg2], pc + ((INT8)(reg1 << 3) >> 2)); break;
+		case 53:	sprintf(buffer, "JR      %s%08X", condition[reg2], pc + ((int8)(reg1 << 3) >> 2)); break;
 		case 54:	sprintf(buffer, "MMULT   R%02d,R%02d", reg1, reg2);					break;
 		case 55:	sprintf(buffer, "MTOI    R%02d,R%02d", reg1, reg2);					break;
 		case 56:	sprintf(buffer, "NORMI   R%02d,R%02d", reg1, reg2);					break;