Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/cpu/x86/vm/interpreter_x86.hpp	Fri Apr 30 04:27:25 2010 -0700
     1.2 +++ b/src/cpu/x86/vm/interpreter_x86.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 @@ -31,39 +31,16 @@
    1.11    // the fpu stack.
    1.12    static const int return_sentinel;
    1.13  
    1.14 -
    1.15 -  static Address::ScaleFactor stackElementScale() {
    1.16 -    return TaggedStackInterpreter? Address::times_8 : Address::times_4;
    1.17 -  }
    1.18 +  static Address::ScaleFactor stackElementScale() { return Address::times_4; }
    1.19  
    1.20    // Offset from rsp (which points to the last stack element)
    1.21 -  static int expr_offset_in_bytes(int i) { return stackElementSize()*i ; }
    1.22 -  static int expr_tag_offset_in_bytes(int i) {
    1.23 -    assert(TaggedStackInterpreter, "should not call this");
    1.24 -    return expr_offset_in_bytes(i) + wordSize;
    1.25 -  }
    1.26 -
    1.27 -  // Support for Tagged Stacks
    1.28 +  static int expr_offset_in_bytes(int i) { return stackElementSize * i; }
    1.29  
    1.30    // Stack index relative to tos (which points at value)
    1.31 -  static int expr_index_at(int i)     {
    1.32 -    return stackElementWords() * i;
    1.33 -  }
    1.34 -
    1.35 -  static int expr_tag_index_at(int i) {
    1.36 -    assert(TaggedStackInterpreter, "should not call this");
    1.37 -    // tag is one word above java stack element
    1.38 -    return stackElementWords() * i + 1;
    1.39 -  }
    1.40 +  static int expr_index_at(int i)        { return stackElementWords * i; }
    1.41  
    1.42    // Already negated by c++ interpreter
    1.43 -  static int local_index_at(int i)     {
    1.44 -    assert(i<=0, "local direction already negated");
    1.45 -    return stackElementWords() * i + (value_offset_in_bytes()/wordSize);
    1.46 +  static int local_index_at(int i) {
    1.47 +    assert(i <= 0, "local direction already negated");
    1.48 +    return stackElementWords * i;
    1.49    }
    1.50 -
    1.51 -  static int local_tag_index_at(int i) {
    1.52 -    assert(i<=0, "local direction already negated");
    1.53 -    assert(TaggedStackInterpreter, "should not call this");
    1.54 -    return stackElementWords() * i + (tag_offset_in_bytes()/wordSize);
    1.55 -  }