X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjagdasm.cpp;h=885e46a664fcbde6bd230094978dc1626015ddc4;hb=725caa0f8bb826a73edef366906ccb41a3197819;hp=e2730495534e289c483e32f9d1a34a436bf5febf;hpb=9af4fb023287b26dce01a36c65c9e30f56481051;p=virtualjaguar

diff --git a/src/jagdasm.cpp b/src/jagdasm.cpp
index e273049..885e46a 100644
--- a/src/jagdasm.cpp
+++ b/src/jagdasm.cpp
@@ -22,7 +22,7 @@
 
 #define ROPCODE(a) JaguarReadWord(a)
 
-uint8 convert_zero[32] =
+uint8_t 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 };
 
 const char * condition[32] =
@@ -66,7 +66,7 @@ const char * condition[32] =
 
 
 
-char * signed_16bit(int16 val)
+char * signed_16bit(int16_t val)
 {
 	static char temp[10];
 
@@ -114,14 +114,14 @@ unsigned dasmjag(int dsp_type, char * bufferOut, unsigned pc)
 		case 21:	sprintf(buffer, "DIV     R%02d,R%02d", reg1, reg2);				break;
 		case 22:	sprintf(buffer, "ABS     R%02d", reg2);							break;
 		case 23:	sprintf(buffer, "SH      R%02d,R%02d", reg1, reg2);				break;
-		case 24:	sprintf(buffer, "SHLQ    $%X,R%02d", 32 - convert_zero[reg1], reg2);	break;
+		case 24:	sprintf(buffer, "SHLQ    $%X,R%02d", 32 - reg1, reg2);	break;
 		case 25:	sprintf(buffer, "SHRQ    $%X,R%02d", convert_zero[reg1], reg2);	break;
 		case 26:	sprintf(buffer, "SHA     R%02d,R%02d", reg1, reg2);				break;
 		case 27:	sprintf(buffer, "SHARQ   $%X,R%02d", convert_zero[reg1], reg2);	break;
 		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_t)(reg1 << 11) >> 11), reg2);break;
 		case 32:	if (dsp_type == JAGUAR_GPU)
 						sprintf(buffer, "SAT8    R%02d", reg2);
 					else
@@ -159,7 +159,7 @@ unsigned dasmjag(int dsp_type, char * bufferOut, 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$%X", condition[reg2], pc + ((int8)(reg1 << 3) >> 2)); break;
+		case 53:	sprintf(buffer, "JR      %s$%X", condition[reg2], pc + ((int8_t)(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;
@@ -171,7 +171,7 @@ unsigned dasmjag(int dsp_type, char * bufferOut, unsigned pc)
 		case 62:	if (dsp_type == JAGUAR_GPU)
 						sprintf(buffer, "SAT24   R%02d", reg2);
 					else
-						sprintf(buffer, "illegal");
+						sprintf(buffer, "illegal [%d,%d]", reg1, reg2);
 					break;
 		case 63:	if (dsp_type == JAGUAR_GPU)
 						sprintf(buffer, (reg1 ? "UNPACK  R%02d" : "PACK    R%02d"), reg2);
@@ -187,7 +187,7 @@ unsigned dasmjag(int dsp_type, char * bufferOut, unsigned pc)
 		sprintf(bufferOut, "%04X            %-24s", op, buffer);
 	else
 	{
-		uint16 word1 = ROPCODE(pc), word2 = ROPCODE(pc + 2);
+		uint16_t word1 = ROPCODE(pc), word2 = ROPCODE(pc + 2);
 		sprintf(bufferOut, "%04X %04X %04X  %-24s", op, word1, word2, buffer);
 	}
 #endif