aboutsummaryrefslogtreecommitdiff
path: root/src/cpu/sparc/vm
diff options
context:
space:
mode:
authorkvn <none@none>2013-06-07 11:43:53 -0700
committerkvn <none@none>2013-06-07 11:43:53 -0700
commit6d5e3b1788eaa75a49394166d852925a11cba660 (patch)
tree640e8fc5f3e5c479c2ec35fbde061f44a91d0ead /src/cpu/sparc/vm
parent44f449e42839d61c07c9bf89fff1c85e8ffd8ea8 (diff)
parente53363487512ce73a5aa56ff35b4890aeaf307c5 (diff)
Merge
Diffstat (limited to 'src/cpu/sparc/vm')
-rw-r--r--src/cpu/sparc/vm/macroAssembler_sparc.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpu/sparc/vm/macroAssembler_sparc.cpp b/src/cpu/sparc/vm/macroAssembler_sparc.cpp
index 578650a34..c17b7c2b3 100644
--- a/src/cpu/sparc/vm/macroAssembler_sparc.cpp
+++ b/src/cpu/sparc/vm/macroAssembler_sparc.cpp
@@ -3540,7 +3540,8 @@ void MacroAssembler::eden_allocate(
if (CMSIncrementalMode || !Universe::heap()->supports_inline_contig_alloc()) {
// No allocation in the shared eden.
- ba_short(slow_case);
+ ba(slow_case);
+ delayed()->nop();
} else {
// get eden boundaries
// note: we need both top & top_addr!