Changeset 2081 for rtcg/trunk/src/newasm.c

Timestamp:

01/19/10 14:59:03 (2 years ago)

Author:

mwhitworth

Message:

Add other new files to SVN.

Files:

• rtcg/trunk/src/newasm.c (modified) (11 diffs)

rtcg/trunk/src/newasm.c

@@ -2 +2 @@
 #include <stdlib.h>
 #include <string.h>
+
+#include <debug.h>
+
+#include <x86/modrm.h>
 
 #include "asm.h"
@@ -84 +88 @@
                                 case INSTR_SUB:
                                 {
-                                        int modRm=instruction[1];
-
                                         unsigned char mod, reg, rm;
                                         
-                                        AsmModRm(modRm, &mod, &reg, &rm);                               
-                                
-                                        if (modRm & 0x80)
+                                        AsmModRm(instruction[1], &mod, &reg, &rm);                              
+
+                                        switch (mod)
                                         {
-                                                instruction+=3;
-
-                                                ins->operandTypes=(INSTR_REG << DEST_SHIFT) | INSTR_IMM;
-                                                ins->regDest = reg;
-                                                ins->imSrc = 0;
-                                        }else{
-                                                instruction+=5;
-                                                ins->operandTypes=(INSTR_MEMR << DEST_SHIFT) | INSTR_IMM;
-                                                ins->regDest=ASM_REG_ESP;
-                                                ins->disp=8;
-                                                ins->imSrc=0;
+                                                case MOD_REG_MEM:
+                                                        ins->operandTypes = (INSTR_REG << DEST_SHIFT) |
+                                                                INSTR_MEMR;
+
+                                                        ins->regDest = reg;
+                                                        ins->imSrc = (int)instruction[3];
+                                                        
+                                                        instruction += AsmModRmBytes(instruction[1]);
+                                                        instruction++; /* FIX */
+
+                                                        break;
+
+                                                case MOD_REG_MEM_BYTE:
+                                                        break;
+
+                                                case MOD_REG_MEM_WORD:
+                                                        break;
+
+                                                case MOD_REG:
+                                                        instruction += 3;
+                                                        ins->operandTypes=(INSTR_REG << DEST_SHIFT) | INSTR_IMM;
+                                                        ins->regDest = reg;
+                                                        
+                                                        /* FIXME: Check for different sizes of operand */
+                                                        ins->imSrc = (int)instruction[2];
+                                                        break;
+
+                                                default:
+                                                        instruction+=5;
+                                                        ins->operandTypes=(INSTR_MEMR << DEST_SHIFT) | INSTR_IMM;
+                                                        ins->regDest=ASM_REG_ESP;
+                                                        ins->disp=8;
+                                                        ins->imSrc=0;
                                         }
                                         
@@ -171 +195 @@
                                         
                                         ins->operandTypes=(INSTR_REG << DEST_SHIFT) | INSTR_IMM;
-                                        
+                                
+                                        /* FIXME: May be wrong */
                                         memcpy(&ins->imSrc, &instruction[1], 4);
                                         ins->regDest=ASM_REG_EAX;
@@ -196 +221 @@
                 }
         
-                if (curr == curr->next)
-                        break;
-
-                printf("curr = %#X, next = %#X\n", curr, curr->next);
                 curr=curr->next;
         }
 }
 
+/*
+ * AsmClearDeadCode
+ *
+ * If there are no references to a block, delete it. This may happen
+ * because an if test now returns a constant value
+ */
+
 void AsmClearDeadCode(struct AsmContext* context)
 {
+        TRACE_ENTER();
+
         struct AsmBlock* curr=context->head;
         
@@ -219 +249 @@
                         free(curr->prev);
         }
+
+        TRACE_EXIT();
 }
 
 void AsmAddConstantsBlock(struct AsmContext* context, struct AsmBlock* block, unsigned long* regValues[])
 {
+        TRACE_ENTER();
+
         int i;
         struct AsmInstruction* testIns=NULL;
         
-        /* TODO: Better solution? */
         unsigned long* stack[16];
         int currP=0;
@@ -261 +294 @@
                                         {
                                                 int param=(ins->disp >> *regValues[ASM_REG_ESP])-1;
-                                                printf("disp = %d, param %d, %d\n", ins->disp, param, *regValues[ASM_REG_ESP]);
+                                                printf("disp = %d, param %d, %lu\n", ins->disp, param, *regValues[ASM_REG_ESP]);
                                         
                                                 regValues[ins->regDest]=&context->params[param];
@@ -341 +374 @@
         
 out:
+        TRACE_EXIT();
         return;
 }
@@ -346 +380 @@
 void AsmAddConstants(struct AsmContext* context)
 {
+        TRACE_ENTER();
+
         unsigned long* regValues[8];
         int paramOffset=2;
-        
-        regValues[ASM_REG_ESP]=&paramOffset;
+
+        regValues[ASM_REG_ESP]=(unsigned long*)&paramOffset;
         
         AsmAddConstantsBlock(context, context->head, regValues);
+
+        TRACE_EXIT();
 }
 
@@ -454 +492 @@
 }
 
+/* Main function */
 void* AsmGenerate(struct AsmContext* context)
 {
@@ -464 +503 @@
         /* Dead code elimination. Remove blocks with no references. */  
         AsmClearDeadCode(context);
-        
         AsmMergeBlocks(context);
-
         AsmRemoveUnused(context);
 
-        length=AsmWriteCode(context, out);
+        length = AsmWriteCode(context, out);
 
         printf("Function length: %u bytes.\n", length);
@@ -475 +512 @@
         AsmPrintCode(out, length);
         
-        /* Check if we're at the end of the function. */
-        
-//      free(out);
-        
         return out;
 }