Rename J9CAS8Helper to OMRCAS8Helper

Signed-off-by: Younes Manton <[email protected]>
eclipse-omr · Sep 11, 2018 · 288cb97 · 288cb97
1 parent ab2edf7
commit 288cb97
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/include_core/AtomicSupport.hpp b/include_core/AtomicSupport.hpp
@@ -407,7 +407,7 @@ class VM_AtomicSupport
 		}
 #endif /* defined(ATOMIC_ALLOW_PRE_READ) */
 #if defined(OMR_ARCH_POWER) && !defined(OMR_ENV_DATA64) /* defined(ATOMIC_SUPPORT_STUB) */
-		return J9CAS8Helper(address, ((uint32_t*)&oldValue)[1], ((uint32_t*)&oldValue)[0], ((uint32_t*)&newValue)[1], ((uint32_t*)&newValue)[0]);
+		return OMRCAS8Helper(address, ((uint32_t*)&oldValue)[1], ((uint32_t*)&oldValue)[0], ((uint32_t*)&newValue)[1], ((uint32_t*)&newValue)[0]);
 #elif defined(OMRZTPF) /* defined(OMR_ARCH_POWER) && !defined(OMR_ENV_DATA64) */
 		csg((csg_t *)&oldValue, (csg_t *)address, (csg_t)newValue);
 		return oldValue;

diff --git a/include_core/omrutilbase.h b/include_core/omrutilbase.h
@@ -154,7 +154,7 @@ uintptr_t setAtomic(volatile uintptr_t *address, uintptr_t value);
  * @return  The old value read from addr
  */
 uint64_t
-J9CAS8Helper(volatile uint64_t *addr, uint32_t compareLo, uint32_t compareHi, uint32_t swapLo, uint32_t swapHi);
+OMRCAS8Helper(volatile uint64_t *addr, uint32_t compareLo, uint32_t compareHi, uint32_t swapLo, uint32_t swapHi);
 
 #endif /* !OMR_ENV_DATA64 && (AIXPPC || LINUXPPC) */
 

diff --git a/util/omrutil/unix/aix/32/cas8help.s b/util/omrutil/unix/aix/32/cas8help.s
@@ -56,18 +56,18 @@
 	.toc
 TOC.static: .tc .static[tc],_static[ro]
 	.csect _static[ro]
- 	.globl .J9CAS8Helper[pr]
-	.globl J9CAS8Helper[ds]
-	.globl .J9CAS8Helper
+	.globl .OMRCAS8Helper[pr]
+	.globl OMRCAS8Helper[ds]
+	.globl .OMRCAS8Helper
 	.toc
-TOC.J9CAS8Helper: .tc .J9CAS8Helper[tc],J9CAS8Helper[ds]
-	.csect J9CAS8Helper[ds]
-	.long .J9CAS8Helper[pr]
+TOC.OMRCAS8Helper: .tc .OMRCAS8Helper[tc],OMRCAS8Helper[ds]
+	.csect OMRCAS8Helper[ds]
+	.long .OMRCAS8Helper[pr]
 	.long  TOC[tc0]
 	.long  0
-	.csect .J9CAS8Helper[pr]
-	.function .J9CAS8Helper[pr],startproc.J9CAS8Helper,16,0,(endproc.J9CAS8Helper-startproc.J9CAS8Helper)
-	startproc.J9CAS8Helper:
+	.csect .OMRCAS8Helper[pr]
+	.function .OMRCAS8Helper[pr],startproc.OMRCAS8Helper,16,0,(endproc.OMRCAS8Helper-startproc.OMRCAS8Helper)
+	startproc.OMRCAS8Helper:
 # in:
 #
 # r3 = the address of the 8-aligned memory address
@@ -99,4 +99,4 @@ fail:
 	.long 0x7d2061ad # stdcx. r9, 0, r12
 	bne loop
 	blr
-	endproc.J9CAS8Helper:
+	endproc.OMRCAS8Helper:
diff --git a/util/omrutil/unix/linux/ppc/32/cas8help.s b/util/omrutil/unix/linux/ppc/32/cas8help.s
@@ -53,11 +53,11 @@
  	.set r30,30
  	.set r31,31
 	.section ".rodata"
-	.global J9CAS8Helper
-	.type J9CAS8Helper@function
+	.global OMRCAS8Helper
+	.type OMRCAS8Helper@function
 	.section ".text"
 	.align 2
-J9CAS8Helper:
+OMRCAS8Helper:
 # in:
 #
 # r3 = the address of the 8-aligned memory address