/hg/icedtea6: Various bug fixes
enevill at icedtea.classpath.org
enevill at icedtea.classpath.org
Thu Jan 28 09:02:53 PST 2010
changeset ab2479dd2f87 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ab2479dd2f87
author: Edward Nevill <ed at camswl.com>
date: Thu Jan 28 17:02:40 2010 +0000
Various bug fixes
diffstat:
4 files changed, 297 insertions(+), 84 deletions(-)
ChangeLog | 8
ports/hotspot/src/cpu/zero/vm/asm_helper.cpp | 1
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 23 -
ports/hotspot/src/cpu/zero/vm/thumb2.cpp | 349 +++++++++++++++-----
diffs (truncated from 817 to 500 lines):
diff -r 2c335401e50d -r ab2479dd2f87 ChangeLog
--- a/ChangeLog Thu Jan 28 13:41:53 2010 +0100
+++ b/ChangeLog Thu Jan 28 17:02:40 2010 +0000
@@ -1,3 +1,11 @@ 2010-01-27 Andrew John Hughes <ahughes@
+2010-01-28 Edward Nevill <ed at camswl.com>
+
+ * asm_helper.cpp, cppInterpreter_arm.S, thumb2.cpp
+ Add stack checking in JIT code, fix IllegalMonitorException bug,
+ make compilation MP safe, fix bug with large no. of locals,
+ added buffer checking on compile buffer, fix large tableswitch bug,
+ fix byte accessor bug, add opc_return_register_finalizer.
+
2010-01-27 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Reference plugin
diff -r 2c335401e50d -r ab2479dd2f87 ports/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- a/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp Thu Jan 28 13:41:53 2010 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp Thu Jan 28 17:02:40 2010 +0000
@@ -303,6 +303,7 @@ extern "C" void Helper_RaiseIllegalMonit
extern "C" void Helper_RaiseIllegalMonitorException(JavaThread *thread)
{
HandleMark __hm(thread);
+ thread->clear_pending_exception();
InterpreterRuntime::throw_illegal_monitor_state_exception(thread);
}
diff -r 2c335401e50d -r ab2479dd2f87 ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Jan 28 13:41:53 2010 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Jan 28 17:02:40 2010 +0000
@@ -64,6 +64,9 @@
#ifndef DISABLE_HW_FP
#define HW_FP
#endif
+
+#define LEAF_STACK_SIZE 200
+#define STACK_SPARE 40
#define stack r4
#define jpc r5
@@ -504,6 +507,7 @@ do_\label:
.text
+ .global cmpxchg_ptr
cmpxchg_ptr:
stmfd sp!, {r4, r5, r6, r7, r8, lr}
mov r6, #0xffffffc0
@@ -2316,7 +2320,7 @@ fast_normal_entry_synchronized:
ldr r3, [tmp1, #THREAD_JAVA_STACK_BASE]
sub r5, r1, r8, lsl #2
- sub r5, r5, #FRAME_SIZE+4
+ sub r5, r5, #FRAME_SIZE+STACK_SPARE+LEAF_STACK_SIZE
sub r5, r5, r0, lsl #2
cmp r3, r5
bcs stack_overflow_before_frame
@@ -2794,7 +2798,7 @@ fast_normal_entry:
ldr r3, [tmp1, #THREAD_JAVA_STACK_BASE]
sub r5, stack, r7, lsl #2
- sub r5, r5, #FRAME_SIZE+4
+ sub r5, r5, #FRAME_SIZE+STACK_SPARE+LEAF_STACK_SIZE
sub r5, r5, r2, lsl #2
cmp r3, r5
bcs stack_overflow_before_frame
@@ -2879,10 +2883,12 @@ 2:
DISPATCH 0
#ifdef THUMB2EE
+#define THUMB2_MAXLOCALS 1000
call_thumb2:
mov ip, r1
- mov r1, locals
+ sub r1, locals, #THUMB2_MAXLOCALS * 4
ldr r2, [istate, #ISTATE_THREAD]
+ sub r3, locals, #31 * 4
add stack, stack, #4
bx ip
#endif // THUMB2EE
@@ -4154,9 +4160,7 @@ 2:
#endif // USE_COMPILER
#ifdef THUMB2EE
- ldr r1, [r4, #CPUInfo-XXX]
- tst r1, #ARCH_THUMBEE
- blne Thumb2_Initialize
+ bl Thumb2_Initialize
#endif
#ifdef HW_FP
@@ -6165,6 +6169,7 @@ Thumb2_DivZero_Handler:
.global Thumb2_Handle_Exception
.global Thumb2_ArrayBounds_Handler
.global Thumb2_NullPtr_Handler
+ .global Thumb2_Stack_Overflow
Thumb2_ArrayBounds_Handler:
ldr r0, [istate, #ISTATE_METHOD]
ldr jpc, [r0, #METHOD_CONSTMETHOD]
@@ -6178,6 +6183,12 @@ Thumb2_Handle_Exception:
add jpc, jpc, #CONSTMETHOD_CODEOFFSET
bl load_dispatch
b handle_exception
+Thumb2_Stack_Overflow:
+ mov r0, r2
+ ldr ip, [r0, #THREAD_TOP_ZERO_FRAME]
+ str ip, [r0, #THREAD_LAST_JAVA_SP]
+ bl _ZN18InterpreterRuntime24throw_StackOverflowErrorEP10JavaThread
+ ldmfd arm_sp!, {fast_regset, pc}
.global Thumb2_Exit_To_Interpreter
Thumb2_Exit_To_Interpreter:
diff -r 2c335401e50d -r ab2479dd2f87 ports/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/ports/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 28 13:41:53 2010 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 28 17:02:40 2010 +0000
@@ -22,6 +22,9 @@ static char *t2ee_print_regusage;
#endif
#define THUMB2_CODEBUF_SIZE (8 * 1024 * 1024)
+#define THUMB2_MAX_BYTECODE_SIZE 10000
+#define THUMB2_MAX_T2CODE_SIZE 65000
+#define THUMB2_MAXLOCALS 1000
#include <sys/mman.h>
@@ -358,10 +361,36 @@ static char *t2ee_print_regusage;
#define H_PUTSTATIC_A 57
#define H_PUTSTATIC_DW 58
-unsigned handlers[59];
+#define H_STACK_OVERFLOW 59
+
+unsigned handlers[60];
+
+#define LEAF_STACK_SIZE 200
+#define STACK_SPARE 40
+
+#define COMPILER_RESULT_FAILED 1 // Failed to compiled this method
+#define COMPILER_RESULT_FATAL 2 // Fatal - dont try compile anything ever again
+
+#include <setjmp.h>
+
+static jmp_buf compiler_error_env;
+
+#ifdef PRODUCT
+
+#define JASSERT(cond, msg) \
+ do { \
+ if (!(cond)) \
+ longjmp(compiler_error_env, COMPILER_RESULT_FATAL); \
+ } while (0)
+
+#define J_Unimplemented() longjmp(compiler_error_env, COMPILER_RESULT_FATAL)
+
+#else
#define JASSERT(cond, msg) do { if (!(cond)) fatal(msg); } while (0)
#define J_Unimplemented() { report_unimplemented(__FILE__, __LINE__); BREAKPOINT; }
+
+#endif // PRODUCT
#define GET_NATIVE_U2(p) (*(unsigned short *)(p))
@@ -381,14 +410,14 @@ typedef struct Thumb2_CodeBuf {
Thumb2_CodeBuf *thumb2_codebuf;
-unsigned bc_stackinfo[8000];
+unsigned bc_stackinfo[THUMB2_MAX_BYTECODE_SIZE];
unsigned locals_info[1000];
unsigned stack[1000];
unsigned r_local[1000];
#ifdef T2EE_PRINT_DISASS
-short start_bci[65000];
-short end_bci[65000];
+short start_bci[THUMB2_MAX_T2CODE_SIZE];
+short end_bci[THUMB2_MAX_T2CODE_SIZE];
#endif
// XXX hardwired constants!
@@ -472,11 +501,13 @@ typedef unsigned Reg;
#define VFP_D6 70
#define VFP_D7 71
-#define JAZ_V1 ARM_R6
-#define JAZ_V2 ARM_R5
+#define PREGS 5
+
+#define JAZ_V1 ARM_R5
+#define JAZ_V2 ARM_R6
#define JAZ_V3 ARM_R7
-#define JAZ_V4 ARM_R11
-#define JAZ_V5 ARM_R10
+#define JAZ_V4 ARM_R10
+#define JAZ_V5 ARM_R11
#define Rstack ARM_R4
#define Rlocals ARM_R7
@@ -507,9 +538,56 @@ unsigned binary_log2(unsigned n)
return r;
}
+typedef struct Compiled_Method {
+ // All entry points aligned on a cache line boundary
+ // .align CODE_ALIGN
+ // slow_entry: @ callee save interface
+ // push {r4, r5, r6, r7, r9, r10, r11, lr}
+ // bl fast_entry
+ // pop {r4, r5, r6, r7, r9, r10, r11, pc}
+ unsigned slow_entry[3];
+ // osr_tablep: @ pointer to the osr table
+ // .word osr_table
+ unsigned *osr_table;
+ Compiled_Method *next;
+ // OSR Entry point:
+ // R0 = entry point within compiled method
+ // R1 = locals
+ // R2 = thread
+ // osr_entry:
+ // @ Load each local into it register allocated register
+ // ldr <reg>, [R1, #-<local> * 4]
+ // ...
+ // mov Rthread, R2
+ // bx R0
+ // .align CODE_ALIGN
+ unsigned osr_entry[1];
+ // fast_entry:
+ // push {r8, lr}
+ // ... @ The compiled code
+ // pop {r8, pc}
+ // .align WORD_ALIGN
+ // code_handle: @ from interpreted entry
+ // .word slow_entry @ bottom bit must be set!
+ // osr_table:
+ // .word <no. of entries>
+ // @@@ For bytecode 0 and for each backwards branch target
+ // .short <bytecode index>
+ // .short <code offset> @ offset in halfwords from slow_entry
+} Compiled_Method;
+
+Compiled_Method *compiled_method_list = 0;
+Compiled_Method **compiled_method_list_tail_ptr = &compiled_method_list;
+
+typedef struct Thumb2_Entrypoint {
+ unsigned compiled_entrypoint;
+ unsigned osr_entry;
+} Thumb2_Entrypoint;
+
typedef struct CodeBuf {
unsigned short *codebuf;
unsigned idx;
+ unsigned limit;
} CodeBuf;
typedef struct Thumb2_Stack {
@@ -521,6 +599,9 @@ typedef struct Thumb2_Stack {
typedef struct Thumb2_Registers {
unsigned *r_local;
+ unsigned npregs;
+ unsigned pregs[PREGS];
+ int mapping[PREGS];
} Thumb2_Registers;
typedef struct Thumb2_Info {
@@ -535,6 +616,7 @@ typedef struct Thumb2_Info {
Thumb2_Registers *jregs;
unsigned compiled_return;
unsigned zombie_bytes;
+ unsigned is_leaf;
} Thumb2_Info;
#define IS_INT_SIZE_BASE_TYPE(c) (c=='B' || c=='C' || c=='F' || c=='I' || c=='S' || c=='Z')
@@ -1238,10 +1320,12 @@ void Thumb2_pass1(Thumb2_Info *jinfo, un
case opc_invokevirtual:
case opc_invokespecial:
case opc_invokestatic:
+ jinfo->is_leaf = 0;
bci += 3;
break;
case opc_invokeinterface:
+ jinfo->is_leaf = 0;
bci += 5;
break;
@@ -1393,7 +1477,7 @@ int Thumb2_is_zombie(Thumb2_Info *jinfo,
}
#endif // ZOMBIT_DETECTION
-void Thumb2_RegAlloc(Thumb2_Info *jinfo, unsigned *pregs, unsigned npregs)
+void Thumb2_RegAlloc(Thumb2_Info *jinfo)
{
unsigned *locals_info = jinfo->locals_info;
unsigned i, j;
@@ -1401,7 +1485,10 @@ void Thumb2_RegAlloc(Thumb2_Info *jinfo,
unsigned score, max_score;
unsigned local;
unsigned nlocals = jinfo->method->max_locals();
-
+ unsigned *pregs = jinfo->jregs->pregs;
+ unsigned npregs = jinfo->jregs->npregs;
+
+ for (i = 0; i < npregs; i++) jinfo->jregs->mapping[i] = -1;
for (i = 0; i < npregs; i++) {
max_score = 0;
for (j = 0; j < nlocals; j++) {
@@ -1417,6 +1504,7 @@ void Thumb2_RegAlloc(Thumb2_Info *jinfo,
if (max_score < 2) break;
locals_info[local] |= 1<<LOCAL_ALLOCATED;
jinfo->jregs->r_local[local] = pregs[i];
+ jinfo->jregs->mapping[i] = local;
}
#ifdef T2EE_PRINT_REGUSAGE
if (t2ee_print_regusage) {
@@ -1842,6 +1930,8 @@ static const unsigned t_vop_ops[] = {
//------------------------------------------------------------------------------------
+#define TBIT 1
+
#define E_STR_IMM6(src, imm6) (0xce00 | ((imm6)<<3) | (src))
#define E_LDR_IMM6(dst, imm6) (0xcc00 | ((imm6)<<3) | (dst))
#define E_LDR_IMM5(dst, imm5) (0xcb00 | ((imm5)<<3) | (dst))
@@ -2019,6 +2109,8 @@ static const unsigned t_vop_ops[] = {
int out_16(CodeBuf *codebuf, u32 s)
{
+ if (codebuf->idx >= codebuf->limit)
+ longjmp(compiler_error_env, COMPILER_RESULT_FATAL);
codebuf->codebuf[codebuf->idx++] = s;
return 0;
}
@@ -2034,6 +2126,8 @@ int out_16x2(CodeBuf *codebuf, u32 sx2)
int out_32(CodeBuf *codebuf, u32 w)
{
+ if (codebuf->idx + 2 > codebuf->limit)
+ longjmp(compiler_error_env, COMPILER_RESULT_FATAL);
*(u32 *)&(codebuf->codebuf[codebuf->idx]) = w;
codebuf->idx += 2;
return 0;
@@ -4388,7 +4482,9 @@ int Thumb2_Accessor(Thumb2_Info *jinfo)
loc = forward_32(jinfo->codebuf);
out_32(jinfo->codebuf, 0);
out_32(jinfo->codebuf, 0);
- out_32(jinfo->codebuf, 0);
+
+ out_32(jinfo->codebuf, 0); // pointer to osr table
+ out_32(jinfo->codebuf, 0); // next compiled method
// OSR entry point
mov_reg(jinfo->codebuf, ARM_PC, ARM_R0);
@@ -4401,7 +4497,7 @@ int Thumb2_Accessor(Thumb2_Info *jinfo)
ldr_imm(jinfo->codebuf, ARM_R1, ARM_R2, THREAD_JAVA_SP, 1, 0);
ldr_imm(jinfo->codebuf, ARM_R0, ARM_R1, 0, 1, 0);
if (tos_type == btos)
- ldrb_imm(jinfo->codebuf, ARM_R0, ARM_R0, field_offset, 1, 0);
+ ldrsb_imm(jinfo->codebuf, ARM_R0, ARM_R0, field_offset, 1, 0);
else if (tos_type == ctos)
ldrh_imm(jinfo->codebuf, ARM_R0, ARM_R0, field_offset, 1, 0);
else if (tos_type == stos)
@@ -4428,19 +4524,24 @@ void Thumb2_Enter(Thumb2_Info *jinfo)
bl(jinfo->codebuf, out_pos(jinfo->codebuf) + CODE_ALIGN - 4);
ldm(jinfo->codebuf, I_REGSET + (1<<ARM_PC), ARM_SP, POP_FD, 1);
- out_32(jinfo->codebuf, 0);
+ out_32(jinfo->codebuf, 0); // Space for osr_table point
+ out_32(jinfo->codebuf, 0); // Pointer to next method
// OSR entry point == Slow entry + 16 - caller save
// R0 = entry point within compiled method
- // R1 = locals
+ // R1 = locals - THUMB2_MAXLOCALS * 4
// R2 = thread
+ // R3 = locals - 31 * 4
{
int nlocals = jinfo->method->max_locals();
for (i = 0; i < nlocals; i++) {
Reg r = jinfo->jregs->r_local[i];
if (r) {
- ldr_imm(jinfo->codebuf, r, ARM_R1, -i * 4, 1, 0);
+ ldr_imm(jinfo->codebuf, r,
+ (i < 32) ? ARM_R3 : ARM_R1,
+ (i < 32) ? (31 - i) * 4 : (THUMB2_MAXLOCALS - i) * 4,
+ 1, 0);
}
}
mov_reg(jinfo->codebuf, Rthread, ARM_R2);
@@ -4456,6 +4557,19 @@ void Thumb2_Enter(Thumb2_Info *jinfo)
// enter_leave(jinfo->codebuf, 1);
ldr_imm(jinfo->codebuf, Rstack, ARM_R2, THREAD_JAVA_SP, 1, 0);
Thumb2_Debug(jinfo, H_DEBUG_METHODENTRY);
+ {
+ unsigned stacksize;
+
+ stacksize = (extra_locals + jinfo->method->max_stack()) * sizeof(int);
+ stacksize += FRAME_SIZE + STACK_SPARE;
+ if (!jinfo->is_leaf || stacksize > LEAF_STACK_SIZE) {
+ ldr_imm(jinfo->codebuf, ARM_R3, ARM_R2, THREAD_JAVA_STACK_BASE, 1, 0);
+ sub_imm(jinfo->codebuf, ARM_R1, Rstack, stacksize + LEAF_STACK_SIZE);
+ cmp_reg(jinfo->codebuf, ARM_R3, ARM_R1);
+ it(jinfo->codebuf, COND_CS, IT_MASK_T);
+ bl(jinfo->codebuf, handlers[H_STACK_OVERFLOW]);
+ }
+ }
mov_imm(jinfo->codebuf, ARM_R1, 0);
if (extra_locals > 0) {
@@ -4610,6 +4724,8 @@ unsigned opcode2handler[] = {
#define OPCODE2HANDLER(opc) (handlers[opcode2handler[(opc)-opc_idiv]])
+extern "C" void _ZN18InterpreterRuntime18register_finalizerEP10JavaThreadP7oopDesc(void);
+
void Thumb2_codegen(Thumb2_Info *jinfo, unsigned start)
{
unsigned code_size = jinfo->code_size;
@@ -4636,7 +4752,7 @@ void Thumb2_codegen(Thumb2_Info *jinfo,
stackdepth = stackinfo & ~BC_FLAGS_MASK;
bc_stackinfo[bci] = (stackinfo & BC_FLAGS_MASK) | (codebuf->idx * 2) | BC_COMPILED;
- if (opcode > OPC_LAST_JAVA_OP) {
+ if (opcode > OPC_LAST_JAVA_OP && opcode != opc_return_register_finalizer) {
if (Bytecodes::is_defined((Bytecodes::Code)opcode))
opcode = (unsigned)Bytecodes::java_code((Bytecodes::Code)opcode);
}
@@ -5951,6 +6067,41 @@ add_imm(jinfo->codebuf, ARM_R3, ARM_R3,
if (!jinfo->compiled_return) jinfo->compiled_return = bci;
break;
+ case opc_return_register_finalizer: {
+ Thumb2_Stack *jstack = jinfo->jstack;
+ Reg r, r_tmp;
+ unsigned loc_eq;
+
+ Thumb2_Flush(jinfo);
+ Thumb2_Load(jinfo, 0, stackdepth);
+ r = POP(jstack);
+ r_tmp = Thumb2_Tmp(jinfo, (1<<r));
+ ldr_imm(jinfo->codebuf, r_tmp, r, 4, 1, 0);
+ ldr_imm(jinfo->codebuf, r_tmp, r_tmp, KLASS_PART+KLASS_ACCESSFLAGS, 1, 0);
+ tst_imm(jinfo->codebuf, r_tmp, JVM_ACC_HAS_FINALIZER);
+ loc_eq = forward_16(jinfo->codebuf);
+ Thumb2_save_locals(jinfo, stackdepth);
+ mov_reg(jinfo->codebuf, ARM_R1, r);
+ ldr_imm(jinfo->codebuf, ARM_R0, Ristate, ISTATE_METHOD, 1, 0);
+ ldr_imm(jinfo->codebuf, ARM_R0, ARM_R0, METHOD_CONSTMETHOD, 1, 0);
+ add_imm(jinfo->codebuf, ARM_R0, ARM_R0, bci+CONSTMETHOD_CODEOFFSET);
+ str_imm(jinfo->codebuf, ARM_R0, Ristate, ISTATE_BCP, 1, 0);
+ sub_imm(jinfo->codebuf, ARM_R0, Rstack, 4);
+ str_imm(jinfo->codebuf, ARM_R0, Ristate, ISTATE_STACK, 1, 0);
+
+ mov_reg(jinfo->codebuf, ARM_R0, Rthread);
+ mov_imm(jinfo->codebuf, ARM_R3, (u32)_ZN18InterpreterRuntime18register_finalizerEP10JavaThreadP7oopDesc);
+ blx_reg(jinfo->codebuf, ARM_R3);
+
+ ldr_imm(jinfo->codebuf, ARM_R3, Rthread, THREAD_PENDING_EXC, 1, 0);
+ cmp_imm(jinfo->codebuf, ARM_R3, 0);
+ it(jinfo->codebuf, COND_NE, IT_MASK_T);
+ bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION]);
+ bcc_patch(jinfo->codebuf, COND_EQ, loc_eq);
+ Thumb2_Return(jinfo, opc_return);
+ break;
+ }
+
case opc_new: {
unsigned loc;
@@ -6246,7 +6397,9 @@ add_imm(jinfo->codebuf, ARM_R3, ARM_R3,
} else {
JASSERT((dest & 1) == 0 && (table_loc & 1) == 0, "unaligned code");
offset = (dest >> 1) - (table_loc >> 1);
- JASSERT(offset < 65536, "offset too big in tableswitch");
+ if (offset >= 65536) {
+ longjmp(compiler_error_env, COMPILER_RESULT_FAILED);
+ }
out_16(jinfo->codebuf, offset);
}
}
@@ -6316,8 +6469,10 @@ void Thumb2_tablegen(Thumb2_Info *jinfo)
unsigned bci;
unsigned *count_pos = (unsigned *)out_pos(jinfo->codebuf);
unsigned count = 0;
-
- out_32(jinfo->codebuf, 0);
+ unsigned i;
+ CodeBuf *codebuf = jinfo->codebuf;
+
+ out_32(codebuf, 0);
bc_stackinfo[0] |= BC_BACK_TARGET;
for (bci = 0; bci < code_size;) {
unsigned stackinfo = bc_stackinfo[bci];
@@ -6327,8 +6482,11 @@ void Thumb2_tablegen(Thumb2_Info *jinfo)
if (stackinfo & BC_BACK_TARGET) {
unsigned code_offset = (stackinfo & ~BC_FLAGS_MASK) >> 1;
JASSERT(stackinfo & BC_COMPILED, "back branch target not compiled???");
- JASSERT(code_offset < (1<<16), "oops, codesize too big");
- out_32(jinfo->codebuf, (bci << 16) | code_offset);
More information about the distro-pkg-dev
mailing list