From cbf08490972127a84229ee8946a41e0b5f142924 Mon Sep 17 00:00:00 2001 From: twisti Date: Sat, 4 Feb 2006 23:56:24 +0000 Subject: [PATCH] * src/vm/jit/allocator/simplereg.c (allocate_scratch_registers): Generate an exception instead of exiting. * src/vm/jit/allocator/lsra.c (lsra_scan_registers_canditates): Likewise. --- src/vm/jit/allocator/lsra.c | 8 +++++--- src/vm/jit/allocator/simplereg.c | 9 +++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/vm/jit/allocator/lsra.c b/src/vm/jit/allocator/lsra.c index 44c878812..b24d3fe8a 100644 --- a/src/vm/jit/allocator/lsra.c +++ b/src/vm/jit/allocator/lsra.c @@ -28,7 +28,7 @@ Changes: Christian Thalinger - $Id: lsra.c 4357 2006-01-22 23:33:38Z twisti $ + $Id: lsra.c 4434 2006-02-04 23:56:24Z twisti $ */ @@ -2685,8 +2685,10 @@ Check this - ? For every incoming Stack Slot a lifetime has to be created ? break; default: - throw_cacao_exception_exit(string_java_lang_InternalError, - "Unknown ICMD %d during register allocation", iptr->opc); + *exceptionptr = + new_internalerror("Unknown ICMD %d during register allocation", + iptr->opc); + return; } /* switch */ #if defined(LSRA_USES_REG_RES) diff --git a/src/vm/jit/allocator/simplereg.c b/src/vm/jit/allocator/simplereg.c index 983e67e5a..2bfbe664a 100644 --- a/src/vm/jit/allocator/simplereg.c +++ b/src/vm/jit/allocator/simplereg.c @@ -31,7 +31,7 @@ Christian Ullrich Michael Starzinger - $Id: simplereg.c 4387 2006-01-30 14:24:56Z christian $ + $Id: simplereg.c 4434 2006-02-04 23:56:24Z twisti $ */ @@ -1452,9 +1452,10 @@ static void allocate_scratch_registers(methodinfo *m, registerdata *rd) break; default: - throw_cacao_exception_exit(string_java_lang_InternalError, - "Unknown ICMD %d during register allocation", - iptr->opc); + *exceptionptr = + new_internalerror("Unknown ICMD %d during register allocation", + iptr->opc); + return; } /* switch */ iptr++; } /* while instructions */ -- 2.25.1