PatchSet 5670
Date: 2004/12/19 23:45:06
Author: doogie
Branch: HEAD
Tag: (none)
Log:
With recent DBG() macro now behaving like a real statement, all calls to it
must be followed with a ;. Since the above files weren't the default on my
machine, they got missed in the cleanup.
Members:
ChangeLog:1.3215->1.3216
config/i386/jit-i386.def:1.17->1.18
kaffe/kaffevm/intrp/machine.c:1.43->1.44
kaffe/kaffevm/jit/machine.c:1.70->1.71
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3215 kaffe/ChangeLog:1.3216
--- kaffe/ChangeLog:1.3215 Sun Dec 19 23:12:22 2004
+++ kaffe/ChangeLog Sun Dec 19 23:45:06 2004
@@ -1,5 +1,13 @@
2004-12-19 Adam Heath <[EMAIL PROTECTED]>
+ * config/i386/jit-i386.def, kaffe/kaffevm/intrp/machine.c,
+ kaffe/kaffevm/jit/machine.c:
+ With recent DBG() macro now behaving like a real statement, all
+ calls to it must be followed with a ;. Since the above files weren't
+ the default on my machine, they got missed in the cleanup.
+
+2004-12-19 Adam Heath <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/kaffe.def:
Make the trace_jcode macro take variable args.
Index: kaffe/config/i386/jit-i386.def
diff -u kaffe/config/i386/jit-i386.def:1.17 kaffe/config/i386/jit-i386.def:1.18
--- kaffe/config/i386/jit-i386.def:1.17 Tue Jul 13 14:17:03 2004
+++ kaffe/config/i386/jit-i386.def Sun Dec 19 23:45:09 2004
@@ -1697,7 +1697,7 @@
{
DBG(REGFORCE,
dprintf ("kill_readonce_register(%s)\n", regname(s->regno));
- )
+ );
if (((reginfo[s->regno].ctype & Rdouble) && (s->regno == REG_dbl0)) ||
((reginfo[s->regno].ctype & Rfloat) && (s->regno == REG_flt0))) {
OUT(0xDD);
Index: kaffe/kaffe/kaffevm/intrp/machine.c
diff -u kaffe/kaffe/kaffevm/intrp/machine.c:1.43
kaffe/kaffe/kaffevm/intrp/machine.c:1.44
--- kaffe/kaffe/kaffevm/intrp/machine.c:1.43 Thu Dec 16 06:13:52 2004
+++ kaffe/kaffe/kaffevm/intrp/machine.c Sun Dec 19 23:45:09 2004
@@ -56,12 +56,12 @@
#define define_insn(code) break;
\
case code: \
- IDBG( dprintf("%03ld: %s\n", (long) pc, #code);
)
+ IDBG( dprintf("%03ld: %s\n", (long) pc, #code);
);
#define define_insn_alias(code) case code:
\
- IDBG( dprintf("%03ld: %s\n", (long) pc, #code);
)
+ IDBG( dprintf("%03ld: %s\n", (long) pc, #code);
);
#define define_wide_insn(code) break;
\
case code: \
- IDBG( dprintf("%03ld: %s\n", (long) pc, #code);
)
+ IDBG( dprintf("%03ld: %s\n", (long) pc, #code);
);
#define EXPLICIT_CHECK_NULL(_i, _s, _n) \
cbranch_ref_const_ne((_s), 0, reference_label(_i, _n)); \
@@ -127,12 +127,12 @@
}
}
-CDBG( dprintf("Call: %s.%s%s.\n", meth->class->name->data, meth->name->data,
METHOD_SIGD(meth)); )
+CDBG( dprintf("Call: %s.%s%s.\n", meth->class->name->data, meth->name->data,
METHOD_SIGD(meth)); );
/* If this is native, then call the real function */
methaccflags = meth->accflags;
if (methaccflags & ACC_NATIVE) {
-NDBG( dprintf("Call to native %s.%s%s.\n", meth->class->name->data,
meth->name->data, METHOD_SIGD(meth)); )
+NDBG( dprintf("Call to native %s.%s%s.\n", meth->class->name->data,
meth->name->data, METHOD_SIGD(meth)); );
if (methaccflags & ACC_STATIC) {
callMethodA(meth, meth, 0, (jvalue*)arg,
(jvalue*)retval, 1);
}
@@ -235,7 +235,7 @@
cleanupExceptionHandling(&mjbuf, thread_data);
-RDBG( dprintf("Returning from method %s%s.\n", meth->name->data,
METHOD_SIGD(meth)); )
+RDBG( dprintf("Returning from method %s%s.\n", meth->name->data,
METHOD_SIGD(meth)); );
}
void runVirtualMachine(methods *meth, slots *lcl, slots *sp, uintp npc, slots
*retval, volatile VmExceptHandler *mjbuf, threadData *thread_data) {
Index: kaffe/kaffe/kaffevm/jit/machine.c
diff -u kaffe/kaffe/kaffevm/jit/machine.c:1.70
kaffe/kaffe/kaffevm/jit/machine.c:1.71
--- kaffe/kaffe/kaffevm/jit/machine.c:1.70 Thu Dec 16 06:13:53 2004
+++ kaffe/kaffe/kaffevm/jit/machine.c Sun Dec 19 23:45:09 2004
@@ -222,7 +222,7 @@
DBG(MOREJIT,
dprintf("asked to translate = %s.%s(%s)\n",
meth->class->name->data, meth->name->data, METHOD_SIGD(meth));
- )
+ );
/* If this code block is native, then just set it up and return */
if ((meth->accflags & ACC_NATIVE) != 0) {
@@ -249,7 +249,7 @@
DBG(MOREJIT,
dprintf("successfully verified = %s.%s(%s)\n",
meth->class->name->data, meth->name->data, METHOD_SIGD(meth));
- )
+ );
/* Only one in the translator at once. */
enterTranslator();
@@ -278,7 +278,7 @@
jitting->class->name->data, jitting->name->data,
METHOD_SIGD(jitting));
}
- )
+ );
/* start modifying global variables now */
assert(jitting == 0 || !!!"reentered jitter"); /* DEBUG */
jitting = meth; /* DEBUG */
@@ -335,7 +335,7 @@
while (npc < len && !IS_STARTOFBASICBLOCK(npc) &&
!IS_STARTOFEXCEPTION(npc)) {
npc = npc + insnLen[base[npc]];
}
-DBG(JIT, dprintf("unreachable basic block pc [%d:%d]\n", pc, npc
- 1); )
+DBG(JIT, dprintf("unreachable basic block pc [%d:%d]\n", pc, npc
- 1); );
if (IS_STARTOFBASICBLOCK(npc)) {
end_basic_block();
start_basic_block();
@@ -344,7 +344,7 @@
continue;
}
-DBG(JIT, dprintf("pc = %d, npc = %d\n", pc, npc); )
+DBG(JIT, dprintf("pc = %d, npc = %d\n", pc, npc); );
/* Determine various exception conditions */
checkCaughtExceptions(meth, pc);
@@ -400,7 +400,7 @@
dprintf("Translated %s.%s%s (%s) %p\n", meth->class->name->data,
meth->name->data, METHOD_SIGD(meth),
isStatic ? "static" : "normal", METHOD_NATIVECODE(meth));
- )
+ );
if (Kaffe_JavaVMArgs.enableVerboseJIT) {
tme = currentTime();
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
