--- a/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp	Fri Mar 21 16:36:59 2014 -0700
+++ b/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp	Mon Mar 24 21:30:43 2014 +0100
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2014 SAP AG. All rights reserved.
+ * Copyright 2012, 2013 SAP AG. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -321,15 +321,6 @@
   }
 }
 
-inline void MacroAssembler::store_heap_oop_not_null(Register d, RegisterOrConstant offs, Register s1, Register tmp) {
-  if (UseCompressedOops) {
-    Register compressedOop = encode_heap_oop_not_null((tmp != noreg) ? tmp : d, d);
-    stw(compressedOop, offs, s1);
-  } else {
-    std(d, offs, s1);
-  }
-}
-
 inline void MacroAssembler::load_heap_oop(Register d, RegisterOrConstant offs, Register s1) {
   if (UseCompressedOops) {
     lwz(d, offs, s1);
@@ -339,17 +330,13 @@
   }
 }
 
-inline Register MacroAssembler::encode_heap_oop_not_null(Register d, Register src) {
-  Register current = (src!=noreg) ? src : d; // Compressed oop is in d if no src provided.
+inline void MacroAssembler::encode_heap_oop_not_null(Register d) {
   if (Universe::narrow_oop_base() != NULL) {
-    sub(d, current, R30);
-    current = d;
+    sub(d, d, R30);
   }
   if (Universe::narrow_oop_shift() != 0) {
-    srdi(d, current, LogMinObjAlignmentInBytes);
-    current = d;
+    srdi(d, d, LogMinObjAlignmentInBytes);
   }
-  return current; // Encoded oop is in this register.
 }
 
 inline void MacroAssembler::decode_heap_oop_not_null(Register d) {
@@ -398,10 +385,4 @@
   twi(traptoEqual | traptoGreaterThanUnsigned, a/*reg a*/, si16);
 }
 
-#if defined(ABI_ELFv2)
-inline address MacroAssembler::function_entry() { return pc(); }
-#else
-inline address MacroAssembler::function_entry() { return emit_fd(); }
-#endif
-
 #endif // CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP