comparison src/cpu/zero/vm/assembler_zero.cpp @ 7232:310a68c63b69

Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 14 Dec 2012 15:19:38 +0100
parents f0c2369fda5a
children 0c535211ef13
comparison
equal deleted inserted replaced
7231:c0806f4ff3ea 7232:310a68c63b69
44 44
45 int AbstractAssembler::code_fill_byte() { 45 int AbstractAssembler::code_fill_byte() {
46 return 0; 46 return 0;
47 } 47 }
48 48
49 #ifdef ASSERT
50 bool AbstractAssembler::pd_check_instruction_mark() {
51 ShouldNotCallThis();
52 }
53 #endif
54
49 void Assembler::pd_patch_instruction(address branch, address target) { 55 void Assembler::pd_patch_instruction(address branch, address target) {
50 ShouldNotCallThis(); 56 ShouldNotCallThis();
51 } 57 }
52 58
53 #ifndef PRODUCT 59 #ifndef PRODUCT
78 void MacroAssembler::store_oop(jobject obj) { 84 void MacroAssembler::store_oop(jobject obj) {
79 code_section()->relocate(pc(), oop_Relocation::spec_for_immediate()); 85 code_section()->relocate(pc(), oop_Relocation::spec_for_immediate());
80 emit_address((address) obj); 86 emit_address((address) obj);
81 } 87 }
82 88
89 void MacroAssembler::store_Metadata(Metadata* md) {
90 code_section()->relocate(pc(), metadata_Relocation::spec_for_immediate());
91 emit_address((address) md);
92 }
93
83 static void should_not_call() { 94 static void should_not_call() {
84 report_should_not_call(__FILE__, __LINE__); 95 report_should_not_call(__FILE__, __LINE__);
85 } 96 }
86 97
87 address ShouldNotCallThisStub() { 98 address ShouldNotCallThisStub() {