1.1 --- a/src/cpu/sparc/vm/interpreter_sparc.hpp Fri Apr 30 04:27:25 2010 -0700 1.2 +++ b/src/cpu/sparc/vm/interpreter_sparc.hpp Fri Apr 30 08:37:24 2010 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. 1.6 + * Copyright 1997-2010 Sun Microsystems, Inc. All Rights Reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -24,33 +24,13 @@ 1.11 1.12 public: 1.13 1.14 - // Support for Tagged Stacks 1.15 + static int expr_offset_in_bytes(int i) { return stackElementSize * i + wordSize; } 1.16 1.17 // Stack index relative to tos (which points at value) 1.18 - static int expr_index_at(int i) { 1.19 - return stackElementWords() * i; 1.20 - } 1.21 - 1.22 - static int expr_tag_index_at(int i) { 1.23 - assert(TaggedStackInterpreter, "should not call this"); 1.24 - // tag is one word above java stack element 1.25 - return stackElementWords() * i + 1; 1.26 - } 1.27 - 1.28 - static int expr_offset_in_bytes(int i) { return stackElementSize()*i + wordSize; } 1.29 - static int expr_tag_offset_in_bytes (int i) { 1.30 - assert(TaggedStackInterpreter, "should not call this"); 1.31 - return expr_offset_in_bytes(i) + wordSize; 1.32 - } 1.33 + static int expr_index_at(int i) { return stackElementWords * i; } 1.34 1.35 // Already negated by c++ interpreter 1.36 - static int local_index_at(int i) { 1.37 - assert(i<=0, "local direction already negated"); 1.38 - return stackElementWords() * i + (value_offset_in_bytes()/wordSize); 1.39 + static int local_index_at(int i) { 1.40 + assert(i <= 0, "local direction already negated"); 1.41 + return stackElementWords * i; 1.42 } 1.43 - 1.44 - static int local_tag_index_at(int i) { 1.45 - assert(i<=0, "local direction already negated"); 1.46 - assert(TaggedStackInterpreter, "should not call this"); 1.47 - return stackElementWords() * i + (tag_offset_in_bytes()/wordSize); 1.48 - }