Changeset 835

Timestamp:

02/05/07 19:47:02 (2 years ago)

Author:

common

Message:

libemu

• instrtest
  
  • -n forces nasm compilation of all instructions, else the precompiled code is taken (if availible)
    
  • fixed some indentings
    
  • added precompiled code to all instructions
    

Files:

• libemu/trunk/testsuite/instrtest.c (modified) (14 diffs)

libemu/trunk/testsuite/instrtest.c

@@ -21 +21 @@
-#define SUCCESS "\033[32;1msuccess\033[0m"
-
-
+
+
+
+
+
-
-static const char *regm[] = {
@@ -60 +64 @@
-    },*/
-    /* 00 */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* 01 */
-        {
-                .instr = "add ax,cx",
-
-
-
+
+
+
+
+
-                .out_state.mem_state = {0, 0},
-        },
-        {
-                .instr = "add [ecx],ax",
-
+
+
+
-                .in_state.mem_state = {0x40000, 0x22224444},
- 
+
-                .out_state.mem_state = {0x40000, 0x22225555},
-        },
-        {
-                .instr = "add eax,ecx",
-
-
-
+
+
+
+
+
-                .out_state.mem_state = {0, 0},
-        },
-        {
-                .instr = "add [ecx],eax",
-
+
+
+
-                .in_state.mem_state = {0x40000, 0x22224444},
- 
+
-                .out_state.mem_state = {0x40000, 0x44445555},
-        },
-        /* 02 */
-        {
-1
- 
- 
- 
-
- 
+l
+    
+
+
+
+
-                .out_state.mem_state = {0, 0},
-        },
-        {
-                .instr = "add al,[ecx]",
-
+
+
+
-                .in_state.mem_state = {0x40000, 0x30303030},
- 
+
-                .out_state.mem_state = {0x40000, 0x30303030},
-        },
@@ -130 +150 @@
-        {
-                .instr = "add cx,di",
- 
- 
- 
-
- 
+        
+
+
+
+
-                .out_state.mem_state = {0, 0},
-        },
-        {
-                .instr = "add ax,[ecx]",
-
+
+
+
-                .in_state.mem_state = {0x40000, 0x44443333},
- 
+
-                .out_state.mem_state = {0x40000, 0x44443333},
-        },
-        {
-                .instr = "add ecx,edi",
- 
- 
- 
-
- 
+    
+
+
+
+
-                .out_state.mem_state = {0, 0},
-        },
-        {
-                .instr = "add eax,[ecx]",
-
+
+
+
-                .in_state.mem_state = {0x40000, 0x44443333},
- 
+
-                .out_state.mem_state = {0x40000, 0x44443333},
-        },
-        {
-                .instr = "add ecx,[ebx+eax*4+0xdeadbeef]",
-
+
+
+
-                .in_state.mem_state = {0xdeadbef8, 0x44443333},
- 
+
-                .out_state.mem_state = {0xdeadbef8, 0x44443333},
-        },
-        /* 04 */
-        {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        /* 05 */
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -197 +229 @@
-        for (i=0;i<sizeof(tests)/sizeof(struct instr_test);i++)
-        {
-
+opts.nasm_force == 0 && 
-                { // dup it so we can free it
-                        uint8_t *c = (uint8_t *)malloc(tests[i].codesize);
@@ -207 +239 @@
-                        FILE *f=fopen("/tmp/foo.S","w+");
-
+                        if (f == NULL)
+                        {
+                                printf("failed to create asm file for nasm instruction %s\n\n\t%s",tests[i].instr,strerror(errno));
+                                return -1;
+                        }
+
-                        fwrite(use,strlen(use),1,f);
-                        fwrite(tests[i].instr,1,strlen(tests[i].instr),f);
@@ -212 +250 @@
-                        system("cd /tmp/; nasm foo.S");
-                        f=fopen("/tmp/foo","r");
+                        if (f == NULL)
+                        {
+                                printf("failed to open compiled nasm file for read for instruction %s\n\n\t%s",tests[i].instr,strerror(errno));
+                                return -1;
+                        }
+
-                        fseek(f,0,SEEK_END);
-
@@ -243 +287 @@
-                int j=0;
-
-
+opts.
-                {
-                        printf("code '");
@@ -275 +319 @@
-                emu_cpu_eip_set(emu_cpu_get(e), static_offset);
-
-
+opts.
-                {
-                emu_log_level_set(emu_logging_get(e),EMU_LOG_DEBUG);
@@ -290 +334 @@
-   
-
-
+opts.
-                {
-                        emu_log_level_set(emu_logging_get(e),EMU_LOG_DEBUG);
@@ -304 +348 @@
-                        if ( emu_cpu_reg32_get(cpu, j) ==  tests[i].out_state.reg[j] )
-                        {
-
+opts.
-                                        printf("\t %s "SUCCESS"\n",regm[j]);
-                        } else
@@ -321 +365 @@
-                                if ( value == tests[i].out_state.mem_state[1] )
-                                {
-
+opts.
-                                                printf("\t memory "SUCCESS"\n");
-                                }
@@ -361 +405 @@
-int main(int argc, char *argv[])
-{
-verbose = 0
+memset(&opts,0,sizeof(struct run_time_options))
-
-        while ( 1 )
@@ -369 +413 @@
-                static struct option long_options[] = {
-                        {"verbose"                      , 0, 0, 'v'},
+                        {"nasm-force"           , 0, 0, 'n'},
-                        {0, 0, 0, 0}
-                };
-
-
+n
-                if ( c == -1 )
-                        break;
@@ -379 +424 @@
-                {
-                case 'v':
-
+opts.
-                        break;
+
+                case 'n':
+                        opts.nasm_force = 1;
+                        break;
+
-
-                default: