PatchSet 4620
Date: 2004/04/04 06:11:54
Author: doogie
Branch: HEAD
Tag: (none)
Log:
* kaffe/kaffevm/debug.c: Fix const casting.
* kaffe/kaffevm/exception.h: Fixed warnings that I caused when I last
checked this in.
* kaffe/kaffevm/jit3/{{basecode,funcs}.[ch],icode.c}: Fix a bunch of nested
extern/duplicate definition warnings.
Members:
ChangeLog:1.2197->1.2198
kaffe/kaffevm/debug.c:1.49->1.50
kaffe/kaffevm/exception.h:1.25->1.26
kaffe/kaffevm/jit3/basecode.c:1.4->1.5
kaffe/kaffevm/jit3/basecode.h:1.8->1.9
kaffe/kaffevm/jit3/funcs.c:1.10->1.11
kaffe/kaffevm/jit3/funcs.h:INITIAL->1.1
kaffe/kaffevm/jit3/icode.c:1.39->1.40
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2197 kaffe/ChangeLog:1.2198
--- kaffe/ChangeLog:1.2197 Sun Apr 4 05:09:56 2004
+++ kaffe/ChangeLog Sun Apr 4 06:11:54 2004
@@ -1,3 +1,11 @@
+2004-04-04 Adam Heath <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/debug.c: Fix const casting.
+ * kaffe/kaffevm/exception.h: Fixed warnings that I caused when I
+ last checked this in.
+ * kaffe/kaffevm/jit3/{{basecode,funcs}.[ch],icode.c}: Fix a bunch
+ of nested extern/duplicate definition warnings.
+
2004-04-03 Adam Heath <[EMAIL PROTECTED]>
* scripts/sort-warnings.pl: Print out the warning count per file.
Index: kaffe/kaffe/kaffevm/debug.c
diff -u kaffe/kaffe/kaffevm/debug.c:1.49 kaffe/kaffe/kaffevm/debug.c:1.50
--- kaffe/kaffe/kaffevm/debug.c:1.49 Thu Mar 25 17:53:03 2004
+++ kaffe/kaffe/kaffevm/debug.c Sun Apr 4 06:11:56 2004
@@ -71,9 +71,9 @@
*/
static struct debug_opts
{
- char *name;
+ const char *name;
debugmask_t mask;
- char *desc;
+ const char *desc;
} debug_opts[] =
{
/* XXX Clean these names up, re-order them and make them consistent. */
Index: kaffe/kaffe/kaffevm/exception.h
diff -u kaffe/kaffe/kaffevm/exception.h:1.25 kaffe/kaffe/kaffevm/exception.h:1.26
--- kaffe/kaffe/kaffevm/exception.h:1.25 Sat Apr 3 02:57:43 2004
+++ kaffe/kaffe/kaffevm/exception.h Sun Apr 4 06:11:56 2004
@@ -78,7 +78,7 @@
struct
{
/* Frame address for JNI entry function. */
- uintp fp;
+ void * fp;
} jni;
/*
* The intrp bits are only valid if meth != 0 && meth
Index: kaffe/kaffe/kaffevm/jit3/basecode.c
diff -u kaffe/kaffe/kaffevm/jit3/basecode.c:1.4 kaffe/kaffe/kaffevm/jit3/basecode.c:1.5
--- kaffe/kaffe/kaffevm/jit3/basecode.c:1.4 Tue Jul 1 15:56:57 2003
+++ kaffe/kaffe/kaffevm/jit3/basecode.c Sun Apr 4 06:11:57 2004
@@ -118,7 +118,7 @@
}
void
-_slot_const_const(SlotInfo* dst, jword s1, jword s2, ifunc f, int type)
+slot_const_const(SlotInfo* dst, jword s1, jword s2, ifunc f, int type)
{
sequence* seq = nextSeq();
@@ -135,7 +135,7 @@
}
void
-_slot_slot_const(SlotInfo* dst, SlotInfo* s1, jword s2, ifunc f, int type)
+slot_slot_const(SlotInfo* dst, SlotInfo* s1, jword s2, ifunc f, int type)
{
sequence* seq;
#if defined(TWO_OPERAND)
@@ -166,7 +166,7 @@
}
void
-_slot_slot_fconst(SlotInfo* dst, SlotInfo* s1, float s2, ifunc f, int type)
+slot_slot_fconst(SlotInfo* dst, SlotInfo* s1, float s2, ifunc f, int type)
{
sequence* seq = nextSeq();
@@ -179,7 +179,7 @@
}
void
-_slot_slot_slot(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2, ifunc f, int type)
+slot_slot_slot(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2, ifunc f, int type)
{
sequence* seq;
#if defined(TWO_OPERAND)
@@ -223,7 +223,7 @@
}
void
-_lslot_lslot_lslot(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2, ifunc f, int type)
+lslot_lslot_lslot(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2, ifunc f, int type)
{
sequence* seq;
#if defined(TWO_OPERAND)
@@ -260,7 +260,7 @@
}
void
-_lslot_lslot_slot(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2, ifunc f, int type)
+lslot_lslot_slot(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2, ifunc f, int type)
{
sequence* seq;
#if defined(TWO_OPERAND)
@@ -297,7 +297,7 @@
}
void
-_slot_slot_lslot(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2, ifunc f, int type)
+slot_slot_lslot(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2, ifunc f, int type)
{
sequence* seq;
#if defined(TWO_OPERAND)
@@ -334,7 +334,7 @@
}
void
-_slot_lslot_lslot(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2, ifunc f, int type)
+slot_lslot_lslot(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2, ifunc f, int type)
{
sequence* seq;
@@ -353,7 +353,7 @@
}
void
-_lslot_lslot_const(SlotInfo* dst, SlotInfo* s1, jword s2, ifunc f, int type)
+lslot_lslot_const(SlotInfo* dst, SlotInfo* s1, jword s2, ifunc f, int type)
{
sequence* seq = nextSeq();
@@ -366,7 +366,7 @@
}
void
-_lslot_lslot_lconst(SlotInfo* dst, SlotInfo* s1, jlong s2, ifunc f, int type)
+lslot_lslot_lconst(SlotInfo* dst, SlotInfo* s1, jlong s2, ifunc f, int type)
{
sequence* seq = nextSeq();
@@ -379,7 +379,7 @@
}
void
-_lslot_slot_const(SlotInfo* dst, SlotInfo* s1, jword s2, ifunc f, int type)
+lslot_slot_const(SlotInfo* dst, SlotInfo* s1, jword s2, ifunc f, int type)
{
sequence* seq = nextSeq();
@@ -396,7 +396,7 @@
}
void
-_lslot_slot_lconst(SlotInfo* dst, SlotInfo* s1, jlong s2, ifunc f, int type)
+lslot_slot_lconst(SlotInfo* dst, SlotInfo* s1, jlong s2, ifunc f, int type)
{
sequence* seq = nextSeq();
@@ -409,7 +409,7 @@
}
void
-_lslot_slot_fconst(SlotInfo* dst, SlotInfo* s1, double s2, ifunc f, int type)
+lslot_slot_fconst(SlotInfo* dst, SlotInfo* s1, double s2, ifunc f, int type)
{
sequence* seq = nextSeq();
@@ -422,7 +422,7 @@
}
void
-_slot_slot_slot_const_const(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2,
+slot_slot_slot_const_const(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2,
jword s3, jword s4, ifunc f,
int type)
{
@@ -444,7 +444,7 @@
}
void
-_slot_slot_const_const_const(SlotInfo* dst, SlotInfo* s1, jword s2,
+slot_slot_const_const_const(SlotInfo* dst, SlotInfo* s1, jword s2,
jword s3, jword s4, ifunc f,
int type)
{
Index: kaffe/kaffe/kaffevm/jit3/basecode.h
diff -u kaffe/kaffe/kaffevm/jit3/basecode.h:1.8 kaffe/kaffe/kaffevm/jit3/basecode.h:1.9
--- kaffe/kaffe/kaffevm/jit3/basecode.h:1.8 Tue Jul 1 15:56:57 2003
+++ kaffe/kaffe/kaffevm/jit3/basecode.h Sun Apr 4 06:11:57 2004
@@ -100,113 +100,22 @@
* provided for every possible instruction format.
*/
-#define slot_const_const(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _slot_const_const((dst), (src), (src2), (func), (t)); \
- }
-void _slot_const_const(SlotInfo*, jword, jword, ifunc, int);
-
-#define slot_slot_const(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _slot_slot_const((dst), (src), (src2), (func), (t)); \
- }
-void _slot_slot_const(SlotInfo*, SlotInfo*, jword, ifunc, int);
-
-#define slot_slot_fconst(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _slot_slot_fconst((dst), (src), (src2), (func), (t)); \
- }
-void _slot_slot_fconst(SlotInfo*, SlotInfo*, float, ifunc, int);
-
-#define slot_slot_slot(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _slot_slot_slot((dst), (src), (src2), (func), (t)); \
- }
-void _slot_slot_slot(SlotInfo*, SlotInfo*, SlotInfo*, ifunc, int);
-
-#define lslot_lslot_const(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _lslot_lslot_const((dst), (src), (src2), (func), (t)); \
- }
-void _lslot_lslot_const(SlotInfo*, SlotInfo*, jword, ifunc, int);
-
-#define lslot_lslot_lconst(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _lslot_lslot_lconst((dst), (src), (src2), (func), (t)); \
- }
-void _lslot_lslot_lconst(SlotInfo*, SlotInfo*, jlong, ifunc, int);
-
-#define lslot_slot_const(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _lslot_slot_const((dst), (src), (src2), (func), (t)); \
- }
-void _lslot_slot_const(SlotInfo*, SlotInfo*, jword, ifunc, int);
-
-#define lslot_slot_lconst(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _lslot_slot_lconst((dst), (src), (src2), (func), (t)); \
- }
-void _lslot_slot_lconst(SlotInfo*, SlotInfo*, jlong, ifunc, int);
-
-#define lslot_slot_fconst(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _lslot_slot_fconst((dst), (src), (src2), (func), (t)); \
- }
-void _lslot_slot_fconst(SlotInfo*, SlotInfo*, double, ifunc, int);
-
-#define lslot_lslot_lslot(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _lslot_lslot_lslot((dst), (src), (src2), (func), (t)); \
- }
-void _lslot_lslot_lslot(SlotInfo*, SlotInfo*, SlotInfo*, ifunc, int);
-
-#define lslot_lslot_slot(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _lslot_lslot_slot((dst), (src), (src2), (func), (t)); \
- }
-void _lslot_lslot_slot(SlotInfo*, SlotInfo*, SlotInfo*, ifunc, int);
-
-#define slot_slot_lslot(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _slot_slot_lslot((dst), (src), (src2), (func), (t)); \
- }
-void _slot_slot_lslot(SlotInfo*, SlotInfo*, SlotInfo*, ifunc, int);
-
-#define slot_lslot_lslot(dst, src, src2, func, t) \
- { \
- void func(sequence*); \
- _slot_lslot_lslot((dst), (src), (src2), (func), (t)); \
- }
-void _slot_lslot_lslot(SlotInfo*, SlotInfo*, SlotInfo*, ifunc, int);
-
-#define slot_slot_slot_const_const(dst, src, src2, src3, src4, func, t) \
- { \
- void func(sequence*); \
- _slot_slot_slot_const_const((dst), (src), (src2), \
- (src3), (src4), (func), (t)); \
- }
-void _slot_slot_slot_const_const(SlotInfo*, SlotInfo*, SlotInfo*,
+void slot_const_const(SlotInfo*, jword, jword, ifunc, int);
+void slot_slot_const(SlotInfo*, SlotInfo*, jword, ifunc, int);
+void slot_slot_fconst(SlotInfo*, SlotInfo*, float, ifunc, int);
+void slot_slot_slot(SlotInfo*, SlotInfo*, SlotInfo*, ifunc, int);
+void lslot_lslot_const(SlotInfo*, SlotInfo*, jword, ifunc, int);
+void lslot_lslot_lconst(SlotInfo*, SlotInfo*, jlong, ifunc, int);
+void lslot_slot_const(SlotInfo*, SlotInfo*, jword, ifunc, int);
+void lslot_slot_lconst(SlotInfo*, SlotInfo*, jlong, ifunc, int);
+void lslot_slot_fconst(SlotInfo*, SlotInfo*, double, ifunc, int);
+void lslot_lslot_lslot(SlotInfo*, SlotInfo*, SlotInfo*, ifunc, int);
+void lslot_lslot_slot(SlotInfo*, SlotInfo*, SlotInfo*, ifunc, int);
+void slot_slot_lslot(SlotInfo*, SlotInfo*, SlotInfo*, ifunc, int);
+void slot_lslot_lslot(SlotInfo*, SlotInfo*, SlotInfo*, ifunc, int);
+void slot_slot_slot_const_const(SlotInfo*, SlotInfo*, SlotInfo*,
jword, jword, ifunc, int);
-
-#define slot_slot_const_const_const(dst, src, src2, src3, src4, func, t) \
- { \
- void func(sequence*); \
- _slot_slot_const_const_const((dst), (src), (src2), \
- (src3), (src4), (func), (t)); \
- }
-void _slot_slot_const_const_const(SlotInfo*, SlotInfo*, jword,
+void slot_slot_const_const_const(SlotInfo*, SlotInfo*, jword,
jword, jword, ifunc, int);
/* -------------------------------------------------------------------- */
Index: kaffe/kaffe/kaffevm/jit3/funcs.c
diff -u kaffe/kaffe/kaffevm/jit3/funcs.c:1.10 kaffe/kaffe/kaffevm/jit3/funcs.c:1.11
--- kaffe/kaffe/kaffevm/jit3/funcs.c:1.10 Sun Apr 4 04:52:36 2004
+++ kaffe/kaffe/kaffevm/jit3/funcs.c Sun Apr 4 06:11:57 2004
@@ -21,6 +21,7 @@
#include "classMethod.h"
#include "icode.h"
#include "machine.h"
+#include "funcs.h"
#undef define_insn
#define define_insn(n, i) void i (sequence* s)
===================================================================
Checking out kaffe/kaffe/kaffevm/jit3/funcs.h
RCS: /home/cvs/kaffe/kaffe/kaffe/kaffevm/jit3/funcs.h,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/kaffe/kaffevm/jit3/funcs.h Sun Apr 4 06:15:19 2004
@@ -0,0 +1,126 @@
+/* machine.h
+ *
+ * Copyright (c) 1996, 1997
+ * Transvirtual Technologies, Inc. All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file.
+ */
+
+#ifndef __funcs_h
+#define __funcs_h
+
+extern void unimplemented (sequence* s);
+extern void nop (sequence* s);
+extern void prologue_xxx (sequence* s);
+extern void check_stack_limit_xRC (sequence* s);
+extern void eprologue_xLx (sequence* s);
+extern void epilogue_xxx (sequence* s);
+extern void spill_Rxx (sequence* s);
+extern void fspill_Rxx (sequence* s);
+extern void fspilll_Rxx (sequence* s);
+extern void reload_Rxx (sequence* s);
+extern void freload_Rxx (sequence* s);
+extern void freloadl_Rxx (sequence* s);
+extern void move_RxC (sequence* s);
+extern void move_RxL (sequence* s);
+extern void move_RxR (sequence* s);
+extern void fmove_RxC (sequence* s);
+extern void fmove_RxR (sequence* s);
+extern void fmovel_RxC (sequence* s);
+extern void fmovel_RxR (sequence* s);
+extern void add_RRR (sequence* s);
+extern void adc_RRR (sequence* s);
+extern void fadd_RRR (sequence* s);
+extern void faddl_RRR (sequence* s);
+extern void sub_RRR (sequence* s);
+extern void sbc_RRR (sequence* s);
+extern void fsub_RRR (sequence* s);
+extern void fsubl_RRR (sequence* s);
+extern void negf_RxR (sequence* s);
+extern void negd_RxR (sequence* s);
+extern void mul_RRR (sequence* s);
+extern void fmul_RRR (sequence* s);
+extern void fmull_RRR (sequence* s);
+extern void div_RRR (sequence* s);
+extern void fdiv_RRR (sequence* s);
+extern void fdivl_RRR (sequence* s);
+extern void rem_RRR (sequence* s);
+extern void and_RRR (sequence* s);
+extern void or_RRR (sequence* s);
+extern void xor_RRR (sequence* s);
+extern void ashr_RRR (sequence* s);
+extern void lshr_RRR (sequence* s);
+extern void lshl_RRR (sequence* s);
+extern void load_RxR (sequence* s);
+extern void fload_RxR (sequence* s);
+extern void floadl_RxR (sequence* s);
+extern void store_xRR (sequence* s);
+extern void fstore_RxR (sequence* s);
+extern void fstorel_RxR (sequence* s);
+extern void cmp_xRR (sequence* s);
+extern void cvtif_RxR (sequence* s);
+extern void cvtid_RxR (sequence* s);
+extern void cvtlf_RxR (sequence* s);
+extern void cvtld_RxR (sequence* s);
+extern void cvtfd_RxR (sequence* s);
+extern void cvtdf_RxR (sequence* s);
+extern void set_word_xxC (sequence* s);
+extern void set_wordpc_xxC (sequence* s);
+extern void set_label_xxC (sequence* s);
+extern void branch_xCC (sequence* s);
+extern void branch_indirect_xRC (sequence* s);
+extern void call_xCC (sequence* s);
+extern void call_xRC (sequence* s);
+extern void call_ind_xCC (sequence* s);
+extern void push_xRC (sequence* s);
+extern void fpush_xRC (sequence* s);
+extern void fpushl_xRC (sequence* s);
+extern void popargs_xxC (sequence* s);
+extern void return_Rxx (sequence* s);
+extern void returnl_Rxx (sequence* s);
+extern void freturn_Rxx (sequence* s);
+extern void freturnl_Rxx (sequence* s);
+extern void returnarg_xxR (sequence* s);
+extern void returnargl_xxR (sequence* s);
+extern void freturnarg_xxR (sequence* s);
+extern void freturnargl_xxR (sequence* s);
+extern void add_RRC (sequence* s);
+extern void sub_RRC (sequence* s);
+extern void load_RRC (sequence* s);
+extern void loadb_RxR (sequence* s);
+extern void loadc_RxR (sequence* s);
+extern void loads_RxR (sequence* s);
+extern void store_xRRC (sequence* s);
+extern void storeb_xRR (sequence* s);
+extern void stores_xRR (sequence* s);
+extern void cmp_xRC (sequence* s);
+extern void push_xCC (sequence* s);
+extern void lshl_RRC (sequence* s);
+extern void monenter_xxRCC (sequence* s);
+extern void monexit_xxRCC (sequence* s);
+extern void get_arg_ptr_R (sequence* s);
+extern void and_RRC (sequence* s);
+extern void or_RRC (sequence* s);
+extern void xor_RRC (sequence* s);
+extern void mul_RRC (sequence* s);
+extern void lshr_RRC (sequence* s);
+extern void ashr_RRC (sequence* s);
+extern void neg_RxR (sequence* s);
+extern void loadb_RRRC (sequence* s);
+extern void load_RRRC (sequence* s);
+extern void loadc_RRRC (sequence* s);
+extern void storeb_RRRC (sequence* s);
+extern void stores_RRRC (sequence* s);
+extern void store_RRRC (sequence* s);
+extern void load_RxA (sequence* s);
+extern void store_xRA (sequence* s);
+extern void storeb_xRRC (sequence* s);
+extern void stores_xRRC (sequence* s);
+extern void store_xRCC (sequence* s);
+extern void storeb_xRCC (sequence* s);
+extern void storeb_RRCC (sequence* s);
+extern void fakecall_xCC (sequence* s);
+extern void cmp_xRRC (sequence* s);
+
+#endif
Index: kaffe/kaffe/kaffevm/jit3/icode.c
diff -u kaffe/kaffe/kaffevm/jit3/icode.c:1.39 kaffe/kaffe/kaffevm/jit3/icode.c:1.40
--- kaffe/kaffe/kaffevm/jit3/icode.c:1.39 Fri Apr 2 21:27:47 2004
+++ kaffe/kaffe/kaffevm/jit3/icode.c Sun Apr 4 06:11:57 2004
@@ -34,6 +34,7 @@
#include "jthread.h"
#include "support.h"
#include "code-analyse.h"
+#include "funcs.h"
#if defined(HAVE_branch_and_link)
#define blink 0x8000000
@@ -70,7 +71,6 @@
/* */
#if defined(HAVE_spill_int)
-void HAVE_spill_int(sequence*);
void
spill_int(SlotData* src)
@@ -83,7 +83,6 @@
#endif
#if defined(HAVE_reload_int)
-void HAVE_reload_int(sequence*);
void
reload_int(SlotData* dst)
@@ -120,7 +119,6 @@
#endif
#if defined(HAVE_spill_long)
-void HAVE_spill_long(sequence*);
void
spill_long(SlotData* src)
@@ -133,7 +131,6 @@
#endif
#if defined(HAVE_reload_long)
-void HAVE_reload_long(sequence*);
void
reload_long(SlotData* dst)
@@ -146,7 +143,6 @@
#endif
#if defined(HAVE_spill_float)
-void HAVE_spill_float(sequence*);
void
spill_float(SlotData* src)
@@ -159,7 +155,6 @@
#endif
#if defined(HAVE_reload_float)
-void HAVE_reload_float(sequence*);
void
reload_float(SlotData* dst)
@@ -172,7 +167,6 @@
#endif
#if defined(HAVE_spill_double)
-void HAVE_spill_double(sequence*);
void
spill_double(SlotData* src)
@@ -185,7 +179,6 @@
#endif
#if defined(HAVE_reload_double)
-void HAVE_reload_double(sequence*);
void
reload_double(SlotData* dst)
@@ -480,14 +473,14 @@
void
_start_sub_block(void)
{
- _slot_const_const(0, (jword)createSpillMask(), SR_SUBBASIC, doReload, Tnull);
+ slot_const_const(0, (jword)createSpillMask(), SR_SUBBASIC, doReload, Tnull);
setupSlotsForBasicBlock();
}
void
_start_basic_block(void)
{
- _slot_const_const(0, (jword)createSpillMask(), SR_BASIC, doReload, Tnull);
+ slot_const_const(0, (jword)createSpillMask(), SR_BASIC, doReload, Tnull);
setupSlotsForBasicBlock();
}
@@ -495,26 +488,26 @@
_end_sub_block(void)
{
mark_all_writes();
- _slot_const_const(0, (jword)createSpillMask(), SR_SUBBASIC, doSpill, Tnull);
+ slot_const_const(0, (jword)createSpillMask(), SR_SUBBASIC, doSpill, Tnull);
}
void
_end_basic_block(void)
{
mark_all_writes();
- _slot_const_const(0, (jword)createSpillMask(), SR_BASIC, doSpill, Tnull);
+ slot_const_const(0, (jword)createSpillMask(), SR_BASIC, doSpill, Tnull);
}
void
_syncRegisters(uintp stk UNUSED, uintp temp UNUSED)
{
- _slot_const_const(0, (jword)createSpillMask(), SR_SYNC, doSpill, Tnull);
+ slot_const_const(0, (jword)createSpillMask(), SR_SYNC, doSpill, Tnull);
}
void
_start_instruction(uintp pc)
{
- _slot_const_const(0, 0, pc, startInsn, Tnull);
+ slot_const_const(0, 0, pc, startInsn, Tnull);
}
void
@@ -537,7 +530,7 @@
begin_sync(void)
{
assert(lastSpill == 0);
- _slot_const_const(0, 0, SR_BASIC, doSpill, Tnull);
+ slot_const_const(0, 0, SR_BASIC, doSpill, Tnull);
lastSpill = activeSeq;
}
@@ -555,7 +548,7 @@
begin_func_sync(void)
{
assert(lastSpill == 0);
- _slot_const_const(0, 0, SR_FUNCTION, doSpill, Tnull);
+ slot_const_const(0, 0, SR_FUNCTION, doSpill, Tnull);
lastSpill = activeSeq;
/* If we might throw and catch and exception we better make everything
@@ -580,7 +573,7 @@
lastSpill = 0;
/* Create a reload and save the slots to reload */
- _slot_const_const(0, (jword)mask, SR_FUNCTION, doReload, Tnull);
+ slot_const_const(0, (jword)mask, SR_FUNCTION, doReload, Tnull);
}
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
