PatchSet 6677
Date: 2005/07/01 17:33:00
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fixes for the JIT3. Fixlet for jit3-powerpc.def in debug mode.
* config/powerpc/jit3-powerpc.def: Fixed access to
KaffeJIT3_getLabelName.
* kaffe/kaffevm/jit3/funcs.h
(HAVE_cvt_double_int_ieee, HAVE_cvt_float_int_ieee): Added missing
prototype.
* kaffe/kaffevm/jit3/icode.c
(and_long_const): Fixed ifdef macro as and_long_const may be defined
in any cases.
(HEADERS): Added the inclusion of fp.h
Members:
ChangeLog:1.4202->1.4203
config/powerpc/jit3-powerpc.def:1.7->1.8
kaffe/kaffevm/jit3/funcs.h:1.4->1.5
kaffe/kaffevm/jit3/icode.c:1.56->1.57
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4202 kaffe/ChangeLog:1.4203
--- kaffe/ChangeLog:1.4202 Fri Jul 1 16:53:35 2005
+++ kaffe/ChangeLog Fri Jul 1 17:33:00 2005
@@ -1,5 +1,19 @@
2005-07-01 Guilhem Lavaux <[EMAIL PROTECTED]>
+ * config/powerpc/jit3-powerpc.def: Fixed access to
+ KaffeJIT3_getLabelName.
+
+ * kaffe/kaffevm/jit3/funcs.h
+ (HAVE_cvt_double_int_ieee, HAVE_cvt_float_int_ieee): Added missing
+ prototype.
+
+ * kaffe/kaffevm/jit3/icode.c
+ (and_long_const): Fixed ifdef macro as and_long_const may be defined
+ in any cases.
+ (HEADERS): Added the inclusion of fp.h
+
+2005-07-01 Guilhem Lavaux <[EMAIL PROTECTED]>
+
* config/powerpc/jit.h: Include jit-labels.h
(CALL_KAFFE_EXCEPTION): Use apple syntax on register if necessary.
Index: kaffe/config/powerpc/jit3-powerpc.def
diff -u kaffe/config/powerpc/jit3-powerpc.def:1.7
kaffe/config/powerpc/jit3-powerpc.def:1.8
--- kaffe/config/powerpc/jit3-powerpc.def:1.7 Fri May 6 15:24:25 2005
+++ kaffe/config/powerpc/jit3-powerpc.def Fri Jul 1 17:33:06 2005
@@ -291,7 +291,7 @@
LOUT(ppc_op_addis(PPC_RCONST_POOL, PPC_RCONST_POOL, 0));
#endif
- // debug((DBOUT,"exception_prologue %s\n",getLabelName(l)));
+ // debug((DBOUT,"exception_prologue
%s\n",KaffeJIT3_getLabelName(l)));
}
}
@@ -1623,7 +1623,7 @@
l->from = CODEPC;
LOUT(0);
- debug((DBOUT,"build_code_ref (@0x%x to 0x%x)\n", l->at,
getLabelName(l)));
+ debug((DBOUT,"build_code_ref (@0x%x to 0x%x)\n", l->at,
KaffeJIT3_getLabelName(l)));
}
/* --------------------------------------------------------------------- */
@@ -1690,7 +1690,7 @@
break;
}
- debug((DBOUT,"branch type %d at 0x%x to %s\n", bt, l -> at,
getLabelName(l)));
+ debug((DBOUT,"branch type %d at 0x%x to %s\n", bt, l -> at,
KaffeJIT3_getLabelName(l)));
}
define_insn(branch_and_link, branchl_xCC)
@@ -1751,7 +1751,7 @@
break;
}
- debug((DBOUT,"branch type %d at 0x%x to %s\n", bt, l -> at,
getLabelName(l)));
+ debug((DBOUT,"branch type %d at 0x%x to %s\n", bt, l -> at,
KaffeJIT3_getLabelName(l)));
}
//
Index: kaffe/kaffe/kaffevm/jit3/funcs.h
diff -u kaffe/kaffe/kaffevm/jit3/funcs.h:1.4
kaffe/kaffe/kaffevm/jit3/funcs.h:1.5
--- kaffe/kaffe/kaffevm/jit3/funcs.h:1.4 Sat May 28 03:01:45 2005
+++ kaffe/kaffe/kaffevm/jit3/funcs.h Fri Jul 1 17:33:06 2005
@@ -196,6 +196,10 @@
extern void HAVE_cvt_double_int (sequence* s);
#endif /* defined(HAVE_cvt_double_int) */
+#if defined(HAVE_cvt_double_int_ieee)
+extern void HAVE_cvt_double_int_ieee (sequence* s);
+#endif /* defined(HAVE_cvt_double_int_ieee) */
+
#if defined(HAVE_cvt_double_long)
extern void HAVE_cvt_double_long (sequence* s);
#endif /* defined(HAVE_cvt_double_long) */
@@ -211,6 +215,10 @@
#if defined(HAVE_cvt_float_long)
extern void HAVE_cvt_float_long (sequence* s);
#endif /* defined(HAVE_cvt_float_long) */
+
+#if defined(HAVE_cvt_float_int_ieee)
+extern void HAVE_cvt_float_int_ieee (sequense* s);
+#endif /* defined(HAVE_cvt_float_int_ieee) */
#if defined(HAVE_cvt_int_byte)
extern void HAVE_cvt_int_byte (sequence* s);
Index: kaffe/kaffe/kaffevm/jit3/icode.c
diff -u kaffe/kaffe/kaffevm/jit3/icode.c:1.56
kaffe/kaffe/kaffevm/jit3/icode.c:1.57
--- kaffe/kaffe/kaffevm/jit3/icode.c:1.56 Fri Jul 1 16:53:39 2005
+++ kaffe/kaffe/kaffevm/jit3/icode.c Fri Jul 1 17:33:07 2005
@@ -36,6 +36,7 @@
#include "code-analyse.h"
#include "funcs.h"
#include "kaffe_jni.h"
+#include "fp.h"
#if defined(HAVE_branch_and_link)
#define blink 0x8000000
@@ -1843,14 +1844,15 @@
#endif
}
-#if defined(HAVE_and_long_const)
void
and_long_const(SlotInfo* dst, SlotInfo* src, jlong val)
{
+#if defined(HAVE_and_long_const)
if (HAVE_and_long_const_rangecheck(val)) {
lslot_lslot_lconst(dst, src, val, HAVE_and_long_const,
Tcomplex);
}
else
+#endif
{
SlotInfo* tmp;
slot_alloctmp(tmp);
@@ -1859,7 +1861,6 @@
slot_freetmp(tmp);
}
}
-#endif
#if defined(HAVE_or_int)
void
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
