From 5f24689d38166286e874feeaebc17399ce46508d Mon Sep 17 00:00:00 2001 From: twisti Date: Wed, 5 Apr 2006 10:02:14 +0000 Subject: [PATCH] * src/vm/jit/alpha/asmpart.S (asm_vm_call_method): Removed !NDEBUG as builtin_throw_exception actually posts the thrown exception to the VM system. * src/vm/jit/powerpc/asmpart.S: Likewise. * src/vm/jit/mips/asmpart.S: Likewise. * src/vm/jit/x86_64/asmpart.S: Likewise. --- src/vm/jit/alpha/asmpart.S | 4 +--- src/vm/jit/mips/asmpart.S | 4 +--- src/vm/jit/powerpc/asmpart.S | 6 ++---- src/vm/jit/x86_64/asmpart.S | 4 +--- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/vm/jit/alpha/asmpart.S b/src/vm/jit/alpha/asmpart.S index 95ef3a1bb..e08037a89 100644 --- a/src/vm/jit/alpha/asmpart.S +++ b/src/vm/jit/alpha/asmpart.S @@ -31,7 +31,7 @@ Christian Thalinger Edwin Steiner - $Id: asmpart.S 4713 2006-03-30 12:01:50Z twisti $ + $Id: asmpart.S 4735 2006-04-05 10:02:14Z twisti $ */ @@ -198,10 +198,8 @@ calljava_ret2: asm_vm_call_method_exception_handler: s8addq s6,sp,sp ldq gp,1*8(sp) /* restore global pointer */ -#if !defined(NDEBUG) mov itmp1,a0 jsr ra,builtin_throw_exception -#endif ldq ra,0*8(sp) /* restore return address */ ldq s6,3*8(sp) lda sp,5*8(sp) /* free stack space */ diff --git a/src/vm/jit/mips/asmpart.S b/src/vm/jit/mips/asmpart.S index 149fa43f4..062fd643a 100644 --- a/src/vm/jit/mips/asmpart.S +++ b/src/vm/jit/mips/asmpart.S @@ -29,7 +29,7 @@ Changes: Christian Thalinger Edwin Steiner - $Id: asmpart.S 4713 2006-03-30 12:01:50Z twisti $ + $Id: asmpart.S 4735 2006-04-05 10:02:14Z twisti $ */ @@ -242,10 +242,8 @@ calljava_return2: asm_vm_call_method_exception_handler: asll s7,s7,3 aaddu sp,s7,sp -#if !defined(NDEBUG) move a0,itmp1 jal builtin_throw_exception -#endif move v0,zero /* clear return value for exception */ b calljava_return2 diff --git a/src/vm/jit/powerpc/asmpart.S b/src/vm/jit/powerpc/asmpart.S index 5c74cdc02..14bf6e2c2 100644 --- a/src/vm/jit/powerpc/asmpart.S +++ b/src/vm/jit/powerpc/asmpart.S @@ -31,7 +31,7 @@ Changes: Christian Thalinger Edwin Steiner - $Id: asmpart.S 4715 2006-03-31 07:50:19Z twisti $ + $Id: asmpart.S 4735 2006-04-05 10:02:14Z twisti $ */ @@ -51,7 +51,7 @@ .align 2 -/* exported functions and variables *******************************************/ +/* export functions ***********************************************************/ .globl asm_vm_call_method .globl asm_vm_call_method_int @@ -277,10 +277,8 @@ L_asm_vm_call_method_return: blr asm_vm_call_method_exception_handler: -#if !defined(NDEBUG) mr r3,itmp1 bl builtin_throw_exception -#endif li v0,0 /* return NULL */ b L_asm_vm_call_method_return diff --git a/src/vm/jit/x86_64/asmpart.S b/src/vm/jit/x86_64/asmpart.S index 80e3056c0..2297e8b5f 100644 --- a/src/vm/jit/x86_64/asmpart.S +++ b/src/vm/jit/x86_64/asmpart.S @@ -30,7 +30,7 @@ Changes: Edwin Steiner - $Id: asmpart.S 4713 2006-03-30 12:01:50Z twisti $ + $Id: asmpart.S 4735 2006-04-05 10:02:14Z twisti $ */ @@ -218,10 +218,8 @@ L_asm_vm_call_method_return: ret asm_vm_call_method_exception_handler: -#if !defined(NDEBUG) mov xptr,a0 /* pass exception pointer */ call builtin_throw_exception@PLT -#endif xor v0,v0 /* return NULL */ jmp L_asm_vm_call_method_return -- 2.25.1