Merged r5534 from trunk:

* src/vm/jit/alpha/emit.c (vm/jit/emit.h): Renamed to
vm/jit/emit-common.h.
(emit_load_s1, emit_load_s2, emit_load_s3, emit_store_dst): Removed.

* src/vm/jit/alpha/codegen.c (vm/jit/emit.h): Renamed to
vm/jit/emit-common.h.

--HG--
branch : unified_variables

diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c
index 828831dd5a8e0a31b75694f6045e056fbcd24c08..24939c6b2c091283a1fbf0d3d7cb49156a374c3a 100644 (file)
--- a/src/vm/jit/alpha/codegen.c
+++ b/src/vm/jit/alpha/codegen.c
@@ -32,7 +32,7 @@
             Christian Ullrich
             Edwin Steiner
 
-   $Id: codegen.c 5518 2006-09-15 16:31:47Z christian $
+   $Id: codegen.c 5563 2006-09-28 20:16:07Z edwin $
 
 */
 
@@ -67,7 +67,7 @@
 #include "vm/jit/asmpart.h"
 #include "vm/jit/codegen-common.h"
 #include "vm/jit/dseg.h"
-#include "vm/jit/emit.h"
+#include "vm/jit/emit-common.h"
 #include "vm/jit/jit.h"
 #include "vm/jit/parse.h"
 #include "vm/jit/patcher.h"

diff --git a/src/vm/jit/alpha/emit.c b/src/vm/jit/alpha/emit.c
index a99639ce299e4341b48c8b656255b7dcc9bbb19f..c4b2558a8a7d4538a5a5b981e2647069623efa08 100644 (file)
--- a/src/vm/jit/alpha/emit.c
+++ b/src/vm/jit/alpha/emit.c
@@ -48,13 +48,11 @@
 #include "vm/jit/abi-asm.h"
 #include "vm/jit/asmpart.h"
 #include "vm/jit/dseg.h"
-#include "vm/jit/emit.h"
+#include "vm/jit/emit-common.h"
 #include "vm/jit/jit.h"
 #include "vm/jit/replace.h"
 
 
-/* code generation functions **************************************************/
-
 /* emit_load *******************************************************************
 
    Emits a possible load of an operand.
@@ -87,63 +85,6 @@ s4 emit_load(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
 }
 
 
-/* emit_load_s1 ****************************************************************
-
-   Emits a possible load of the first source operand.
-
-*******************************************************************************/
-
-s4 emit_load_s1(jitdata *jd, instruction *iptr, s4 tempreg)
-{
-       varinfo       *src;
-       s4 r;
-       
-       src = jd->var + iptr->s1.varindex;
-
-       r = emit_load(jd, iptr, src, tempreg);
-
-       return r;
-}
-
-
-/* emit_load_s2 ****************************************************************
-
-   Emits a possible load of the second source operand.
-
-*******************************************************************************/
-
-s4 emit_load_s2(jitdata *jd, instruction *iptr, s4 tempreg)
-{
-       varinfo       *src;
-       s4 r;
-
-       src = jd->var + iptr->sx.s23.s2.varindex;
-
-       r = emit_load(jd, iptr, src, tempreg);
-
-       return r;
-}
-
-
-/* emit_load_s3 ****************************************************************
-
-   Emits a possible load of the third source operand.
-
-*******************************************************************************/
-
-s4 emit_load_s3(jitdata *jd, instruction *iptr, s4 tempreg)
-{
-       varinfo       *src;
-       s4 r;
-
-       src = jd->var + iptr->sx.s23.s3.varindex;
-
-       r = emit_load(jd, iptr, src, tempreg);
-
-       return r;
-}
-
-
 /* emit_store ******************************************************************
 
    Emit a possible store for the given variable.
@@ -169,22 +110,6 @@ void emit_store(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
 }
 
 
-/* emit_store_dst **************************************************************
-
-   Emit a possible store for the destination operand.
-
-*******************************************************************************/
-
-void emit_store_dst(jitdata *jd, instruction *iptr, s4 d)
-{
-       varinfo *dst;
-       
-       dst = jd->var + iptr->dst.varindex;
-
-       emit_store(jd, iptr, dst, d);
-}
-
-
 /* emit_copy *******************************************************************
 
    Generates a register/memory to register/memory copy.