Changeset 2083 for rtcg/trunk/src/disasm/print.c

Timestamp:

01/20/10 22:36:39 (2 years ago)

Author:

mwhitworth

Message:

Add ndisasm code, use that for printing out optimized code.

Location:

rtcg/trunk/src/disasm

Files:

• . (added)
• print.c (copied) (copied from rtcg/trunk/src/print.c) (1 diff, 1 prop)

rtcg/trunk/src/disasm/print.c

@@ -5 +5 @@
 #include <stdlib.h>
 
-#include <x86/modrm.h>
-
-char* regs[]={"eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi"};
-
 void AsmPrintCode(char* code, int length, FILE* outBuffer, int outLength)
 {
-        int i=0;
-        unsigned char* ins=(unsigned char*)code;
-        
-        while (ins < (unsigned char*)code+length)
-        {
-                printf("\t");
+    char outbuf[256];
 
-                switch (*ins)
-                {
-                        case 0:
-                                ins++;
-                                break;
-                                
-                        case INSTR_XOR:
-                        {
-                                unsigned char mod, reg, rm;
-                                AsmModRm(ins[1], &mod, &reg, &rm);
-                                printf("xor\t%s, %s\n", regs[reg], regs[rm]);
-                                ins+=2;
-                                break;
-                        }
-                                
-                        case INSTR_TEST:
-                                printf("test ecx, ecx\n");
-                                ins+=2;
-                                break;
-                                
-                        case 0xB8 ... 0xBB:
-                        {
-                                char regs[]="acdb";
-                                printf("mov\te%cx, %#lx\n", regs[*ins-0xB8], *(unsigned long*)&ins[1]);
-                                ins+=5;
-                                break;
-                        }
-                        
-                        case INSTR_PUSH_START ... INSTR_PUSH_STOP:
-                        {
-                                printf("push\t%s\n", regs[*ins-INSTR_PUSH_START]);
-                                ins+=1;
-                                break;
-                        }
+    printf("PRINTING OPTIMIZED CODE:\n");
 
-                        case INSTR_SUB:
-                        {
-                                unsigned char mod, reg, rm;
-                                AsmModRm(ins[1], &mod, &reg, &rm);
+    /* Use nasm's disasm function */
+    while (length > 0)
+    {
+        int lendis;
 
-                                switch (mod)
-                                {
-                                        case MOD_REG:
-                                                printf("sub [%s], %#X", regs[rm], ins[3]);
-                                                break;
+        lendis = disasm((unsigned char*)code, outbuf, sizeof(outbuf), 64, 0, 0);
 
-                                        default:
-                                                printf("INSTR_SUB: TODO\n");
-                                                exit(0);
-                                }
+        output_ins(0, (unsigned char*)code, lendis, outbuf);
 
-                                ins += 4;
-                                break;
-                        }
-                        
-                        case INSTR_POP_START ... INSTR_POP_STOP:
-                        {
-                                printf("pop\t%s", regs[*ins-INSTR_POP_START]);
-                                ins+=1;
-                                break;
-                        }
-                                
-                        case INSTR_RET:
-                                printf("ret");
-                                ins++;
-                                break;
-                                
-                        default:
-                                printf("TODO: *ins = %#X\n", *ins);
-                                ins++;
-                }
-
-                printf("\n");
-        }
+        length -= lendis;
+    }
 }