From 8ce02705d334b17db45040b65a53de1d800fc9b6 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Sat, 6 Jun 2009 21:29:45 +0100 Subject: [PATCH] Make word size agnostic. --- rvm/src/org/jikesrvm/ia32/MultianewarrayHelper.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/rvm/src/org/jikesrvm/ia32/MultianewarrayHelper.java b/rvm/src/org/jikesrvm/ia32/MultianewarrayHelper.java index 4a3353640..d700d0fd0 100644 --- a/rvm/src/org/jikesrvm/ia32/MultianewarrayHelper.java +++ b/rvm/src/org/jikesrvm/ia32/MultianewarrayHelper.java @@ -18,6 +18,7 @@ import org.jikesrvm.runtime.Magic; import org.jikesrvm.runtime.RuntimeEntrypoints; import org.vmmagic.unboxed.Address; +import static org.jikesrvm.SizeConstants.BYTES_IN_WORD; /** * Helper routine to pull the parameters to multianewarray off the @@ -47,9 +48,9 @@ static Object newArrayArray(int methodId, int numDimensions, int typeId, int arg // fetch number of elements to be allocated for each array dimension VM.disableGC(); Address argp = Magic.getFramePointer().plus(argOffset); - argp = argp.minus(4); + argp = argp.minus(BYTES_IN_WORD); dim0 = argp.loadInt(); - argp = argp.minus(4); + argp = argp.minus(BYTES_IN_WORD); dim1 = argp.loadInt(); VM.enableGC(); // validate arguments @@ -64,11 +65,7 @@ static Object newArrayArray(int methodId, int numDimensions, int typeId, int arg VM.disableGC(); Address argp = Magic.getFramePointer().plus(argOffset); for (int i = 0; i < numDimensions; ++i) { - if (VM.BuildFor32Addr) { - argp = argp.minus(4); - } else { - argp = argp.minus(8); - } + argp = argp.minus(BYTES_IN_WORD); numElements[i] = argp.loadInt(); } VM.enableGC();