* 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.

diff --git a/src/vm/jit/allocator/lsra.c b/src/vm/jit/allocator/lsra.c
index 44c878812e1d35ed8be4620cd090c9c2ea1d56f9..b24d3fe8a4dc81ef8eb210b39b564183c1707245 100644 (file)
--- 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 983e67e5a23780eb4a50de9b3fe801eeaf194eaf..2bfbe664adbe96e5fb0e6c8d223ec9f66e2145c6 100644 (file)
--- 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 */