1.1 --- a/src/cpu/x86/vm/interp_masm_x86_32.hpp Fri Apr 30 04:27:25 2010 -0700 1.2 +++ b/src/cpu/x86/vm/interp_masm_x86_32.hpp Fri Apr 30 08:37:24 2010 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright 1997-2009 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 @@ -85,16 +85,12 @@ 1.11 void d2ieee(); // truncate dtos to 64bits 1.12 1.13 void pop_ptr(Register r = rax); 1.14 - void pop_ptr(Register r, Register tag); 1.15 void pop_i(Register r = rax); 1.16 void pop_l(Register lo = rax, Register hi = rdx); 1.17 void pop_f(); 1.18 void pop_d(); 1.19 - void pop_ftos_to_rsp(); 1.20 - void pop_dtos_to_rsp(); 1.21 1.22 void push_ptr(Register r = rax); 1.23 - void push_ptr(Register r, Register tag); 1.24 void push_i(Register r = rax); 1.25 void push_l(Register lo = rax, Register hi = rdx); 1.26 void push_d(Register r = rax); 1.27 @@ -112,33 +108,15 @@ 1.28 void pop(void* v ); // Add unimplemented ambiguous method 1.29 void push(void* v ); // Add unimplemented ambiguous method 1.30 1.31 - DEBUG_ONLY(void verify_stack_tag(frame::Tag t);) 1.32 - 1.33 -#endif // CC_INTERP 1.34 - 1.35 -#ifndef CC_INTERP 1.36 - 1.37 - void empty_expression_stack() { 1.38 - movptr(rsp, Address(rbp, frame::interpreter_frame_monitor_block_top_offset * wordSize)); 1.39 - // NULL last_sp until next java call 1.40 - movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD); 1.41 + void empty_expression_stack() { 1.42 + movptr(rsp, Address(rbp, frame::interpreter_frame_monitor_block_top_offset * wordSize)); 1.43 + // NULL last_sp until next java call 1.44 + movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD); 1.45 } 1.46 1.47 - // Tagged stack helpers for swap and dup 1.48 - void load_ptr_and_tag(int n, Register val, Register tag); 1.49 - void store_ptr_and_tag(int n, Register val, Register tag); 1.50 - 1.51 - // Tagged Local support 1.52 - 1.53 - void tag_local(frame::Tag tag, int n); 1.54 - void tag_local(Register tag, int n); 1.55 - void tag_local(frame::Tag tag, Register idx); 1.56 - void tag_local(Register tag, Register idx); 1.57 - 1.58 -#ifdef ASSERT 1.59 - void verify_local_tag(frame::Tag tag, int n); 1.60 - void verify_local_tag(frame::Tag tag, Register idx); 1.61 -#endif // ASSERT 1.62 + // Helpers for swap and dup 1.63 + void load_ptr(int n, Register val); 1.64 + void store_ptr(int n, Register val); 1.65 1.66 // Super call_VM calls - correspond to MacroAssembler::call_VM(_leaf) calls 1.67 void super_call_VM_leaf(address entry_point);