comparison src/cpu/sparc/vm/macroAssembler_sparc.hpp @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents db9981fd3124
children 46c544b8fbfc
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
24 24
25 #ifndef CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP 25 #ifndef CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP
26 #define CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP 26 #define CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP
27 27
28 #include "asm/assembler.hpp" 28 #include "asm/assembler.hpp"
29 #include "utilities/macros.hpp"
29 30
30 // <sys/trap.h> promises that the system will not use traps 16-31 31 // <sys/trap.h> promises that the system will not use traps 16-31
31 #define ST_RESERVED_FOR_USER_0 0x10 32 #define ST_RESERVED_FOR_USER_0 0x10
32 33
33 class BiasedLockingCounters; 34 class BiasedLockingCounters;
1179 // Write to card table for - register is destroyed afterwards. 1180 // Write to card table for - register is destroyed afterwards.
1180 void card_table_write(jbyte* byte_map_base, Register tmp, Register obj); 1181 void card_table_write(jbyte* byte_map_base, Register tmp, Register obj);
1181 1182
1182 void card_write_barrier_post(Register store_addr, Register new_val, Register tmp); 1183 void card_write_barrier_post(Register store_addr, Register new_val, Register tmp);
1183 1184
1184 #ifndef SERIALGC 1185 #if INCLUDE_ALL_GCS
1185 // General G1 pre-barrier generator. 1186 // General G1 pre-barrier generator.
1186 void g1_write_barrier_pre(Register obj, Register index, int offset, Register pre_val, Register tmp, bool preserve_o_regs); 1187 void g1_write_barrier_pre(Register obj, Register index, int offset, Register pre_val, Register tmp, bool preserve_o_regs);
1187 1188
1188 // General G1 post-barrier generator 1189 // General G1 post-barrier generator
1189 void g1_write_barrier_post(Register store_addr, Register new_val, Register tmp); 1190 void g1_write_barrier_post(Register store_addr, Register new_val, Register tmp);
1190 #endif // SERIALGC 1191 #endif // INCLUDE_ALL_GCS
1191 1192
1192 // pushes double TOS element of FPU stack on CPU stack; pops from FPU stack 1193 // pushes double TOS element of FPU stack on CPU stack; pops from FPU stack
1193 void push_fTOS(); 1194 void push_fTOS();
1194 1195
1195 // pops double TOS element from CPU stack and pushes on FPU stack 1196 // pops double TOS element from CPU stack and pushes on FPU stack