Author: dlydick
Date: Fri Jun 30 06:40:58 2006
New Revision: 418274
URL: http://svn.apache.org/viewvc?rev=418274&view=rev
Log:
Added JVMREG_STACK_SP_TOP_OFFSET definition.
Added PUT_SP_STRIP_OPERAND_STACK() macro.
Modified:
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/jvmreg.h
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/jvmreg.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/jvmreg.h?rev=418274&r1=418273&r2=418274&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/jvmreg.h (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/jvmreg.h Fri
Jun 30 06:40:58 2006
@@ -81,7 +81,7 @@
typedef struct
{
- jvm_class_index clsidx; /**< class[clsidx] of code location*/
+ jvm_class_index clsidx; /**< class[clsidx] of code location */
jvm_method_index mthidx; /**< method[mthidx] of code location*/
jvm_attribute_index codeatridx;/**< attributes[atridx] of code */
jvm_attribute_index excpatridx;/**< attributes[atridx] of
@@ -176,10 +176,16 @@
#define JVMREG_STACK_FP_OFFSET JVMREG_STACK_GC_OFFSET \
+ JVMREG_STACK_FP_HEIGHT
-/*! Offsets from current FP of stack pointer */
+/*! Offsets from current FP of program counter */
#define JVMREG_STACK_PC_OFFSET JVMREG_STACK_FP_OFFSET \
+ JVMREG_STACK_PC_HEIGHT
+/*!
+ * Offsets from current FP of top of stack frame,
+ * less operand stack parms.
+ */
+#define JVMREG_STACK_SP_TOP_OFFSET JVMREG_STACK_PC_OFFSET + 0
+
/*@} */ /* End of grouped definitions */
@@ -208,6 +214,9 @@
#define PUT_SP_IMMEDIATE(thridx, value) THREAD(thridx).sp = value
+
+#define PUT_SP_STRIP_OPERAND_STACK(thridx) \
+ PUT_SP_IMMEDIATE(thridx, GET_FP(thridx) + JVMREG_STACK_SP_TOP_OFFSET)
/*@} */ /* End of grouped definitions */
|