Mercurial > hg > Members > kono > jpf-core
diff src/main/gov/nasa/jpf/vm/StackFrame.java @ 25:3517702bd768
added class name to warning for ambiguous native methods (without MJI signatures)
fixed VarTracker, which was utterly unaware of new instruction type hierarchy.
added JVMArrayElementInstruction.get{Array/Index}Attr(ti) since listeners most
likely use attrs which otherwise would have to be retrieved/cached in
executeInstruction() notifications (e.g. variable name for array)
fixed ReadInstruction, which somehow extended StoreInstruction
author | Peter Mehlitz <pcmehlitz@gmail.com> |
---|---|
date | Wed, 22 Apr 2015 15:54:26 -0700 |
parents | 61d41facf527 |
children |
line wrap: on
line diff
--- a/src/main/gov/nasa/jpf/vm/StackFrame.java Tue Apr 21 00:34:15 2015 -0700 +++ b/src/main/gov/nasa/jpf/vm/StackFrame.java Wed Apr 22 15:54:26 2015 -0700 @@ -499,7 +499,7 @@ assert (top >= stackBase); if ((attrs != null)){ - return ObjectList.getFirst( attrs[top], attrType); + return ObjectList.getFirst(attrs[top], attrType); } return null; } @@ -604,9 +604,9 @@ */ public <T> T getOperandAttr (int offset, Class<T> attrType){ int i = top-offset; - assert (i >= stackBase); + assert (i >= stackBase) : this; if (attrs != null){ - return ObjectList.getFirst( attrs[i], attrType); + return ObjectList.getFirst(attrs[i], attrType); } return null; }