* ICMD_MULTIANEWARRAY: Usage of iptr->val.a and iptr->target changed.

diff --git a/src/vm/jit/mips/codegen.c b/src/vm/jit/mips/codegen.c
index cb1275f1c8a0a918262a60bbdf02e5c27533fe6d..4ef6bd595576fee5beceeb5dae615b489548a78b 100644 (file)
--- a/src/vm/jit/mips/codegen.c
+++ b/src/vm/jit/mips/codegen.c
@@ -35,7 +35,7 @@
    This module generates MIPS machine code for a sequence of
    intermediate code commands (ICMDs).
 
-   $Id: codegen.c 4138 2006-01-11 10:35:54Z twisti $
+   $Id: codegen.c 4195 2006-01-13 10:42:23Z twisti $
 
 */
 
@@ -3481,7 +3481,7 @@ gen_method:
                        break;
 
                case ICMD_MULTIANEWARRAY:/* ..., cnt1, [cnt2, ...] ==> ..., arrayref  */
-                                     /* op1 = dimension, val.a = array descriptor    */
+                                     /* op1 = dimension, val.a = class               */
 
                        /* check for negative sizes and copy sizes to stack if necessary  */
 
@@ -3502,12 +3502,13 @@ gen_method:
 
                        /* is patcher function set? */
 
-                       if (iptr->target) {
+                       if (iptr->val.a == NULL) {
                                disp = dseg_addaddress(cd, NULL);
 
                                codegen_addpatchref(cd, mcodeptr,
                                                                        PATCHER_builtin_multianewarray,
-                                                                       iptr->val.a, disp);
+                                                                       (constant_classref *) iptr->target,
+                                                                       disp);
 
                                if (opt_showdisassemble) {
                                        M_NOP; M_NOP;

diff --git a/src/vm/jit/powerpc/codegen.c b/src/vm/jit/powerpc/codegen.c
index 99377a9eac63ad331bd82a8f645e311eabead243..f965af847088868bd6038fba8fa2d9d99e98a19c 100644 (file)
--- a/src/vm/jit/powerpc/codegen.c
+++ b/src/vm/jit/powerpc/codegen.c
@@ -30,7 +30,7 @@
    Changes: Christian Thalinger
             Christian Ullrich
 
-   $Id: codegen.c 4055 2006-01-02 12:59:54Z christian $
+   $Id: codegen.c 4195 2006-01-13 10:42:23Z twisti $
 
 */
 
@@ -3229,7 +3229,7 @@ gen_method:
                        break;
 
                case ICMD_MULTIANEWARRAY:/* ..., cnt1, [cnt2, ...] ==> ..., arrayref  */
-                                     /* op1 = dimension, val.a = array descriptor    */
+                                     /* op1 = dimension, val.a = class               */
 
                        /* check for negative sizes and copy sizes to stack if necessary  */
 
@@ -3254,12 +3254,13 @@ gen_method:
 
                        /* is patcher function set? */
 
-                       if (iptr->target) {
+                       if (iptr->val.a == NULL) {
                                disp = dseg_addaddress(cd, NULL);
 
                                codegen_addpatchref(cd, mcodeptr,
                                                                        PATCHER_builtin_multianewarray,
-                                                                       iptr->val.a, disp);
+                                                                       (constant_classref *) iptr->target,
+                                                                       disp);
 
                                if (opt_showdisassemble)
                                        M_NOP;