diff options
author | twisti <none@none> | 2010-04-30 08:37:24 -0700 |
---|---|---|
committer | twisti <none@none> | 2010-04-30 08:37:24 -0700 |
commit | 38c1c67c3dbc30f9f9aa5af34bfb3b9399b5bc91 (patch) | |
tree | 5d0dd2fe8865622f8a71f66c4b0e81fd280b546a /src/cpu/x86/vm/interpreter_x86.hpp | |
parent | dd6a6d2ec30960e98be4a86775b27cc13443c715 (diff) |
6943304: remove tagged stack interpreter
Reviewed-by: coleenp, never, gbenson
Diffstat (limited to 'src/cpu/x86/vm/interpreter_x86.hpp')
-rw-r--r-- | src/cpu/x86/vm/interpreter_x86.hpp | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/src/cpu/x86/vm/interpreter_x86.hpp b/src/cpu/x86/vm/interpreter_x86.hpp index 04db7fdf7..3633db502 100644 --- a/src/cpu/x86/vm/interpreter_x86.hpp +++ b/src/cpu/x86/vm/interpreter_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1997-2010 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,39 +31,16 @@ // the fpu stack. static const int return_sentinel; - - static Address::ScaleFactor stackElementScale() { - return TaggedStackInterpreter? Address::times_8 : Address::times_4; - } + static Address::ScaleFactor stackElementScale() { return Address::times_4; } // Offset from rsp (which points to the last stack element) - static int expr_offset_in_bytes(int i) { return stackElementSize()*i ; } - static int expr_tag_offset_in_bytes(int i) { - assert(TaggedStackInterpreter, "should not call this"); - return expr_offset_in_bytes(i) + wordSize; - } - - // Support for Tagged Stacks + static int expr_offset_in_bytes(int i) { return stackElementSize * i; } // Stack index relative to tos (which points at value) - static int expr_index_at(int i) { - return stackElementWords() * i; - } - - static int expr_tag_index_at(int i) { - assert(TaggedStackInterpreter, "should not call this"); - // tag is one word above java stack element - return stackElementWords() * i + 1; - } + static int expr_index_at(int i) { return stackElementWords * i; } // Already negated by c++ interpreter - static int local_index_at(int i) { - assert(i<=0, "local direction already negated"); - return stackElementWords() * i + (value_offset_in_bytes()/wordSize); - } - - static int local_tag_index_at(int i) { - assert(i<=0, "local direction already negated"); - assert(TaggedStackInterpreter, "should not call this"); - return stackElementWords() * i + (tag_offset_in_bytes()/wordSize); + static int local_index_at(int i) { + assert(i <= 0, "local direction already negated"); + return stackElementWords * i; } |