* src/vm/jit/intrp/codegen.c (codegen): Restored ICMD_RET to really

perform a RET (JSR elimination will not be performed for intrp.)
Removed a comment that does not apply any more.

diff --git a/src/vm/jit/intrp/codegen.c b/src/vm/jit/intrp/codegen.c
index 5d6fd47f189a7ab16bbdf56d726689934f947d69..07ba1c849bc02325b9f32213648b9d4bfee609e0 100644 (file)
--- a/src/vm/jit/intrp/codegen.c
+++ b/src/vm/jit/intrp/codegen.c
@@ -29,7 +29,7 @@
                        
    Changes: Edwin Steiner
 
-   $Id: codegen.c 5662 2006-10-04 13:40:54Z edwin $
+   $Id: codegen.c 5664 2006-10-04 14:31:01Z edwin $
 
 */
 
@@ -509,12 +509,6 @@ bool intrp_codegen(jitdata *jd)
 
                /* pop/dup/swap operations ********************************************/
 
-               /* attention: double and longs are only one entry in CACAO ICMDs      */
-
-               /* stack.c changes stack manipulation operations to treat
-                  longs/doubles as occupying a single slot.  Here we are
-                  undoing that (and only those things that stack.c did). */
-
                case ICMD_POP:        /* ..., value  ==> ...                          */
 
                        gen_POP(cd);
@@ -1275,7 +1269,6 @@ bool intrp_codegen(jitdata *jd)
                        break;
 
                case ICMD_GOTO:         /* ... ==> ...                                */
-               case ICMD_RET:          /* ... ==> ...                                */
                                        /* op1 = target JavaVM pc                     */
                        gen_branch(GOTO);
                        break;
@@ -1286,7 +1279,13 @@ bool intrp_codegen(jitdata *jd)
                        gen_JSR(cd, NULL);
                        codegen_addreference(cd, iptr->sx.s23.s3.jsrtarget.block);
                        break;
-                       
+
+               case ICMD_RET:          /* ... ==> ...                                */
+                                       /* op1 = local variable                       */
+
+                       gen_RET(cd, index2offset(iptr->s1.varindex));
+                       break;
+
                case ICMD_IFNULL:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc                     */