diff 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
line wrap: on
line diff
--- a/src/cpu/zero/vm/assembler_zero.cpp	Fri Dec 14 14:53:42 2012 +0100
+++ b/src/cpu/zero/vm/assembler_zero.cpp	Fri Dec 14 15:19:38 2012 +0100
@@ -46,6 +46,12 @@
   return 0;
 }
 
+#ifdef ASSERT
+bool AbstractAssembler::pd_check_instruction_mark() {
+  ShouldNotCallThis();
+}
+#endif
+
 void Assembler::pd_patch_instruction(address branch, address target) {
   ShouldNotCallThis();
 }
@@ -80,6 +86,11 @@
   emit_address((address) obj);
 }
 
+void MacroAssembler::store_Metadata(Metadata* md) {
+  code_section()->relocate(pc(), metadata_Relocation::spec_for_immediate());
+  emit_address((address) md);
+}
+
 static void should_not_call() {
   report_should_not_call(__FILE__, __LINE__);
 }