No objections for this issue, and I propose attached patch applied.
Kiyo
diff -Naur kaffe-snap-050113/ChangeLog ../kaffe-snap-050113/ChangeLog
--- kaffe-snap-050113/ChangeLog 2005-01-12 22:20:53.000000000 +0900
+++ ../kaffe-snap-050113/ChangeLog 2005-01-20 05:00:55.000000000 +0900
@@ -1,3 +1,11 @@
+2005-01-19 Kiyo Inaba <[EMAIL PROTECTED]>
+ * kaffe/kaffevm/jit/funcs.c,
+ kaffe/kaffevm/jit3/funcs.c: Remove unused macro 'ALIGN' or
+ 'ALIGN_CODEPC'. The former is not compatible with OpenBSD
+ anyway.
+ * FAQ/FAQ.jit3: Update description of ?OUT macro and remove
+ description of ALIGN_CODEPC.
+
2005-01-12 Guilhem Lavaux <[EMAIL PROTECTED]>
* libraries/javalib/gnu/java/io/EncodingManager.java
diff -Naur kaffe-snap-050113/FAQ/FAQ.jit3 ../kaffe-snap-050113/FAQ/FAQ.jit3
--- kaffe-snap-050113/FAQ/FAQ.jit3 2003-06-26 08:09:14.000000000 +0900
+++ ../kaffe-snap-050113/FAQ/FAQ.jit3 2005-01-20 04:57:23.000000000 +0900
@@ -182,14 +182,11 @@
CODEPC - The current index into codeblock.
- OUT, BOUT, WOUT, LOUT, QOUT - Macros that resolve to a type lvalue
- and automatically increment the CODEPC value. For example, using
- "LOUT = 0x45" in the architecture defs file will put the 32 bit
- value "0x45" into the current position in the code block and
- increment CODEPC by four.
-
- ALIGN_CODEPC(byte) - A macro that aligns the CODEPC to the given
- value.
+ OUT, BOUT, WOUT, LOUT, QOUT - Macros that store values given by
+ arguments into the current position and automatically increment
+ the CODEPC value. For example, using "LOUT(0x45)" in the
+ architecture defs file will put the 32 bit value "0x45" into the
+ current position in the code block and increment CODEPC by four.
kaffe/kaffevm/jit3/icode.c - The implementation of the intermediate
functions. These functions generate "sequence" structures that
diff -Naur kaffe-snap-050113/kaffe/kaffevm/jit/funcs.c
../kaffe-snap-050113/kaffe/kaffevm/jit/funcs.c
--- kaffe-snap-050113/kaffe/kaffevm/jit/funcs.c 2004-12-28 01:09:46.000000000
+0900
+++ ../kaffe-snap-050113/kaffe/kaffevm/jit/funcs.c 2005-01-20
04:52:13.000000000 +0900
@@ -29,11 +29,6 @@
#undef define_insn
#define define_insn(n, i) void i (sequence* s)
-#define ALIGN(byte) \
- (CODEPC = (CODEPC % (byte) \
- ? CODEPC + (byte) - (CODEPC % (byte)) \
- : CODEPC))
-
#if defined(KAFFE_VMDEBUG)
/*
* Print any labels that refer to the current address.
diff -Naur kaffe-snap-050113/kaffe/kaffevm/jit3/funcs.c
../kaffe-snap-050113/kaffe/kaffevm/jit3/funcs.c
--- kaffe-snap-050113/kaffe/kaffevm/jit3/funcs.c 2004-12-28
01:09:48.000000000 +0900
+++ ../kaffe-snap-050113/kaffe/kaffevm/jit3/funcs.c 2005-01-20
04:52:37.000000000 +0900
@@ -30,11 +30,6 @@
nativecode* codeblock;
uintp CODEPC;
-#define ALIGN_CODEPC(byte) \
- (CODEPC = (CODEPC % (byte) \
- ? CODEPC + (byte) - (CODEPC % (byte)) \
- : CODEPC))
-
#if defined(KAFFE_VMDEBUG)
/*
* Print any labels that refer to the current address.
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
