Mercurial > hg > truffle
comparison src/cpu/zero/vm/assembler_zero.cpp @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | e16282db4946 |
children | de6a9e811145 |
comparison
equal
deleted
inserted
replaced
12058:ccb4f2af2319 | 12355:cefad50507d8 |
---|---|
48 } | 48 } |
49 | 49 |
50 #ifdef ASSERT | 50 #ifdef ASSERT |
51 bool AbstractAssembler::pd_check_instruction_mark() { | 51 bool AbstractAssembler::pd_check_instruction_mark() { |
52 ShouldNotCallThis(); | 52 ShouldNotCallThis(); |
53 return false; | |
53 } | 54 } |
54 #endif | 55 #endif |
55 | 56 |
56 void Assembler::pd_patch_instruction(address branch, address target) { | 57 void Assembler::pd_patch_instruction(address branch, address target) { |
57 ShouldNotCallThis(); | 58 ShouldNotCallThis(); |
71 } | 72 } |
72 | 73 |
73 RegisterOrConstant MacroAssembler::delayed_value_impl( | 74 RegisterOrConstant MacroAssembler::delayed_value_impl( |
74 intptr_t* delayed_value_addr, Register tmpl, int offset) { | 75 intptr_t* delayed_value_addr, Register tmpl, int offset) { |
75 ShouldNotCallThis(); | 76 ShouldNotCallThis(); |
77 return RegisterOrConstant(); | |
76 } | 78 } |
77 | 79 |
78 void MacroAssembler::store_oop(jobject obj) { | 80 void MacroAssembler::store_oop(jobject obj) { |
79 code_section()->relocate(pc(), oop_Relocation::spec_for_immediate()); | 81 code_section()->relocate(pc(), oop_Relocation::spec_for_immediate()); |
80 emit_address((address) obj); | 82 emit_address((address) obj); |