[dotgnu-pnet-commits] libjit ChangeLog jit/Makefile.am jit/jit-rules-...

[Aleksey Demakov]

CVSROOT:        /sources/dotgnu-pnet
Module name:    libjit
Changes by:     Aleksey Demakov <avd>   06/08/30 19:23:27

Modified files:
        .              : ChangeLog 
        jit            : Makefile.am jit-rules-x86.c jit-rules-x86.ins 

Log message:
        do not use jit-rules-x86.sel anymore

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libjit/ChangeLog?cvsroot=dotgnu-pnet&r1=1.264&r2=1.265
http://cvs.savannah.gnu.org/viewcvs/libjit/jit/Makefile.am?cvsroot=dotgnu-pnet&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/libjit/jit/jit-rules-x86.c?cvsroot=dotgnu-pnet&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/libjit/jit/jit-rules-x86.ins?cvsroot=dotgnu-pnet&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/dotgnu-pnet/libjit/ChangeLog,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -b -r1.264 -r1.265
--- ChangeLog   30 Aug 2006 18:35:10 -0000      1.264
+++ ChangeLog   30 Aug 2006 19:23:26 -0000      1.265
@@ -8,6 +8,12 @@
        JIT_OP_ADDRESS_OF, and JIT_OP_COPY_STORE_SHORT rules using the
        "frame" keyword.
 
+       * jit/Makefile.am, jit/jit-rules-x86.c: remove all references to
+       jit-rules-x86.sel and jit-rules-x86.slc.
+
+       * jit/jit-rules-x86.c: remove mov_memindex_reg_byte() and
+       widen_byte() functions.
+
 2006-08-30  Aleksey Demakov  <address@hidden>
 
        * jit/jit-interp.h, jit/jit-interp.c, jit/jit-opcode.c,

Index: jit/Makefile.am
===================================================================
RCS file: /sources/dotgnu-pnet/libjit/jit/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- jit/Makefile.am     28 Aug 2006 17:19:06 -0000      1.18
+++ jit/Makefile.am     30 Aug 2006 19:23:27 -0000      1.19
@@ -71,8 +71,7 @@
                mklabel.sh \
                jit-rules-alpha.ins \
                jit-rules-arm.sel \
-               jit-rules-x86.ins \
-               jit-rules-x86.sel
+               jit-rules-x86.ins
 
 AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I. -I$(srcdir)
 
@@ -86,11 +85,7 @@
                $(top_srcdir)/include/jit/jit-opcode.h \
                $(top_srcdir)/jit/jit-interp.h >jit-interp-labels.h
 
-jit-rules-x86.lo: jit-rules-x86.slc jit-rules-x86.inc
-
-jit-rules-x86.slc: jit-rules-x86.sel $(top_builddir)/tools/gen-sel$(EXEEXT)
-       $(top_builddir)/tools/gen-sel$(EXEEXT) $(srcdir)/jit-rules-x86.sel \
-                       >jit-rules-x86.slc
+jit-rules-x86.lo: jit-rules-x86.inc
 
 jit-rules-x86.inc: jit-rules-x86.ins $(top_builddir)/tools/gen-rules$(EXEEXT)
        $(top_builddir)/tools/gen-rules$(EXEEXT) $(srcdir)/jit-rules-x86.ins \
@@ -108,5 +103,8 @@
        $(top_builddir)/tools/gen-rules$(EXEEXT) $(srcdir)/jit-rules-alpha.ins \
                        >jit-rules-alpha.inc
 
-CLEANFILES = jit-interp-labels.h jit-rules-x86.slc jit-rules-arm.slc \
-               jit-rules-alpha.slc
+CLEANFILES = \
+       jit-interp-labels.h \
+       jit-rules-alpha.inc \
+       jit-rules-arm.slc \
+       jit-rules-x86.inc

Index: jit/jit-rules-x86.c
===================================================================
RCS file: /sources/dotgnu-pnet/libjit/jit/jit-rules-x86.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- jit/jit-rules-x86.c 29 Aug 2006 11:57:13 -0000      1.38
+++ jit/jit-rules-x86.c 30 Aug 2006 19:23:27 -0000      1.39
@@ -187,11 +187,7 @@
        switch(opcode)
        {
                #define JIT_INCLUDE_SUPPORTED
-#if USE_NEW_REG_ALLOC
                #include "jit-rules-x86.inc"
-#else
-               #include "jit-rules-x86.slc"
-#endif
                #undef JIT_INCLUDE_SUPPORTED
        }
        return 0;
@@ -1261,27 +1257,6 @@
        }
 }
 
-#if !USE_NEW_REG_ALLOC
-/*
- * Widen a byte register.
- */
-static unsigned char *widen_byte(unsigned char *inst, int reg, int isSigned)
-{
-       if(reg == X86_EAX || reg == X86_EBX || reg == X86_ECX || reg == X86_EDX)
-       {
-               x86_widen_reg(inst, reg, reg, isSigned, 0);
-       }
-       else
-       {
-               x86_push_reg(inst, X86_EAX);
-               x86_mov_reg_reg(inst, X86_EAX, reg, 4);
-               x86_widen_reg(inst, reg, X86_EAX, isSigned, 0);
-               x86_pop_reg(inst, X86_EAX);
-       }
-       return inst;
-}
-#endif
-
 /*
  * Shift the contents of a register.
  */
@@ -1447,43 +1422,6 @@
 }
 
 /*
- * Store a byte value to a memindex address.
- */
-static unsigned char *mov_memindex_reg_byte
-               (unsigned char *inst, int basereg,
-                unsigned offset, int indexreg, int srcreg)
-{
-       if(srcreg == X86_EAX || srcreg == X86_EBX ||
-          srcreg == X86_ECX || srcreg == X86_EDX)
-       {
-               x86_mov_memindex_reg(inst, basereg, offset, indexreg,
-                                                        0, srcreg, 1);
-       }
-       else
-       {
-               int tempreg;
-               if(basereg != X86_EAX && indexreg != X86_EAX)
-               {
-                       tempreg = X86_EAX;
-               }
-               else if(basereg != X86_ECX && indexreg != X86_ECX)
-               {
-                       tempreg = X86_ECX;
-               }
-               else
-               {
-                       tempreg = X86_EDX;
-               }
-               x86_push_reg(inst, tempreg);
-               x86_mov_reg_reg(inst, tempreg, srcreg, 4);
-               x86_mov_memindex_reg(inst, basereg, offset, indexreg,
-                                                        0, tempreg, 1);
-               x86_pop_reg(inst, tempreg);
-       }
-       return inst;
-}
-
-/*
  * Throw a builtin exception.
  */
 static unsigned char *throw_builtin
@@ -1602,11 +1540,7 @@
        switch(insn->opcode)
        {
                #define JIT_INCLUDE_RULES
-#if USE_NEW_REG_ALLOC
                #include "jit-rules-x86.inc"
-#else
-               #include "jit-rules-x86.slc"
-#endif
                #undef JIT_INCLUDE_RULES
 
                default:

Index: jit/jit-rules-x86.ins
===================================================================
RCS file: /sources/dotgnu-pnet/libjit/jit/jit-rules-x86.ins,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- jit/jit-rules-x86.ins       30 Aug 2006 18:35:10 -0000      1.13
+++ jit/jit-rules-x86.ins       30 Aug 2006 19:23:27 -0000      1.14
@@ -1633,7 +1633,7 @@
        [=frame, imm] -> {
                x86_mov_membase_imm(inst, X86_EBP, $1, $2, 1);
        }
-       [=frame, reg("eax"|"ecx"|"edx"|"edx")] -> {
+       [=frame, reg("eax"|"ecx"|"edx"|"ebx")] -> {
                x86_mov_membase_reg(inst, X86_EBP, $1, $2, 1);
        }
 
@@ -2054,8 +2054,8 @@
        }
 
 JIT_OP_STORE_ELEMENT_BYTE: ternary
-       [reg, reg, reg] -> {
-               inst = mov_memindex_reg_byte(inst, $1, 0, $2, $3);
+       [reg, reg, reg("eax"|"ecx"|"edx"|"ebx")] -> {
+               x86_mov_memindex_reg(inst, $1, 0, $2, 0, $3, 1);
        }
 
 JIT_OP_STORE_ELEMENT_SHORT: ternary