mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out changeset 5599e2798ee3 (bug 976648)
--HG-- rename : xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S => xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s rename : xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S => xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
This commit is contained in:
Ed Morley
parent
80c6280a3f
commit
f4eb38ce43
@ -214,12 +214,12 @@ if CONFIG['OS_TEST'] == 'powerpc':
|
||||
'xptcstubs_ppc_linux.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['OS_TEST'] in ('powerpc64', 'powerpc64le'):
|
||||
if CONFIG['OS_TEST'] == 'powerpc64':
|
||||
if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'):
|
||||
SOURCES += [
|
||||
'xptcinvoke_asm_ppc64_linux.S',
|
||||
'xptcinvoke_asm_ppc64_linux.s',
|
||||
'xptcinvoke_ppc64_linux.cpp',
|
||||
'xptcstubs_asm_ppc64_linux.S',
|
||||
'xptcstubs_asm_ppc64_linux.s',
|
||||
'xptcstubs_ppc64_linux.cpp',
|
||||
]
|
||||
|
||||
|
||||
@ -17,38 +17,12 @@
|
||||
.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
|
||||
.set f30,30; .set f31,31
|
||||
|
||||
# The ABI defines a fixed stack frame area of 4 doublewords (ELFv2)
|
||||
# or 6 doublewords (ELFv1); the last of these doublewords is used
|
||||
# as TOC pointer save area. The fixed area is followed by a parameter
|
||||
# save area of 8 doublewords (used for vararg routines), followed
|
||||
# by space for parameters passed on the stack.
|
||||
#
|
||||
# We set STACK_TOC to the offset of the TOC pointer save area, and
|
||||
# STACK_PARAMS to the offset of the first on-stack parameter.
|
||||
|
||||
#if _CALL_ELF == 2
|
||||
#define STACK_TOC 24
|
||||
#define STACK_PARAMS 96
|
||||
#else
|
||||
#define STACK_TOC 40
|
||||
#define STACK_PARAMS 112
|
||||
#endif
|
||||
|
||||
#
|
||||
# NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
|
||||
# uint32_t paramCount, nsXPTCVariant* params)
|
||||
#
|
||||
|
||||
#if _CALL_ELF == 2
|
||||
.section ".text"
|
||||
.type NS_InvokeByIndex,@function
|
||||
.globl NS_InvokeByIndex
|
||||
.align 2
|
||||
NS_InvokeByIndex:
|
||||
0: addis 2,12,(.TOC.-0b)@ha
|
||||
addi 2,2,(.TOC.-0b)@l
|
||||
.localentry NS_InvokeByIndex,.-NS_InvokeByIndex
|
||||
#else
|
||||
.section ".toc","aw"
|
||||
.section ".text"
|
||||
.align 2
|
||||
@ -60,7 +34,6 @@ NS_InvokeByIndex:
|
||||
.previous
|
||||
.type NS_InvokeByIndex,@function
|
||||
.NS_InvokeByIndex:
|
||||
#endif
|
||||
mflr 0
|
||||
std 0,16(r1)
|
||||
|
||||
@ -77,12 +50,13 @@ NS_InvokeByIndex:
|
||||
# we don't actually need stack space for those. We must ensure
|
||||
# that the stack remains 16-byte aligned.
|
||||
#
|
||||
# | (fixed area + | | 7 GP | 13 FP | 3 NV |
|
||||
# | param. save) |(params)........| regs | regs | regs |
|
||||
# (r1)......(+STACK_PARAMS)... (-23*8).(-16*8).(-3*8)..(r31)
|
||||
# | ..128-byte stack frame.. | | 7 GP | 13 FP | 3 NV |
|
||||
# | |(params)........| regs | regs | regs |
|
||||
# (r1)...........(+112)....(+128)
|
||||
# (-23*8).(-16*8).(-3*8)..(r31)
|
||||
|
||||
# +stack frame, -unused stack params, +regs storage, +1 for alignment
|
||||
addi r7,r5,((STACK_PARAMS/8)-7+7+13+3+1)
|
||||
addi r7,r5,((112/8)-7+7+13+3+1)
|
||||
rldicr r7,r7,3,59 # multiply by 8 and mask with ~15
|
||||
neg r7,r7
|
||||
stdux r1,r1,r7
|
||||
@ -93,13 +67,12 @@ NS_InvokeByIndex:
|
||||
# uint64_t* d))
|
||||
|
||||
# r5, r6 are passed through intact (paramCount, params)
|
||||
# r7 (d) has to be r1+STACK_PARAMS
|
||||
# -- where parameters are passed on the stack.
|
||||
# r7 (d) has to be r1+112 -- where parameters are passed on the stack.
|
||||
# r3, r4 are above that, easier to address from r31 than from r1
|
||||
|
||||
subi r3,r31,(23*8) # r3 --> GPRS
|
||||
subi r4,r31,(16*8) # r4 --> FPRS
|
||||
addi r7,r1,STACK_PARAMS # r7 --> params
|
||||
addi r7,r1,112 # r7 --> params
|
||||
bl invoke_copy_to_stack
|
||||
nop
|
||||
|
||||
@ -110,18 +83,14 @@ NS_InvokeByIndex:
|
||||
|
||||
sldi r30,r30,3 # Find function descriptor
|
||||
add r9,r9,r30
|
||||
ld r12,0(r9)
|
||||
ld r9,0(r9)
|
||||
|
||||
std r2,STACK_TOC(r1) # Save r2 (TOC pointer)
|
||||
ld r0,0(r9) # Actual address from fd.
|
||||
std r2,40(r1) # Save r2 (TOC pointer)
|
||||
|
||||
#if _CALL_ELF == 2
|
||||
mtctr r12
|
||||
#else
|
||||
ld r0,0(r12) # Actual address from fd.
|
||||
mtctr 0
|
||||
ld r11,16(r12) # Environment pointer from fd.
|
||||
ld r2,8(r12) # TOC pointer from fd.
|
||||
#endif
|
||||
ld r11,16(r9) # Environment pointer from fd.
|
||||
ld r2,8(r9) # TOC pointer from fd.
|
||||
|
||||
# Load FP and GP registers as required
|
||||
ld r4, -(23*8)(r31)
|
||||
@ -148,7 +117,7 @@ NS_InvokeByIndex:
|
||||
|
||||
bctrl # Do it
|
||||
|
||||
ld r2,STACK_TOC(r1) # Load our own TOC pointer
|
||||
ld r2,40(r1) # Load our own TOC pointer
|
||||
ld r1,0(r1) # Revert stack frame
|
||||
ld 0,16(r1) # Reload lr
|
||||
ld 29,-24(r1) # Restore NVGPRS
|
||||
@ -157,11 +126,7 @@ NS_InvokeByIndex:
|
||||
mtlr 0
|
||||
blr
|
||||
|
||||
#if _CALL_ELF == 2
|
||||
.size NS_InvokeByIndex,.-NS_InvokeByIndex
|
||||
#else
|
||||
.size NS_InvokeByIndex,.-.NS_InvokeByIndex
|
||||
#endif
|
||||
|
||||
# Magic indicating no need for an executable stack
|
||||
.section .note.GNU-stack, "", @progbits ; .previous
|
||||
@ -74,9 +74,7 @@ invoke_copy_to_stack(uint64_t* gpregs,
|
||||
fpregs[i] = s->val.f; // if passed in registers, floats are promoted to doubles
|
||||
} else {
|
||||
float *p = (float *)d;
|
||||
#ifndef __LITTLE_ENDIAN__
|
||||
p++;
|
||||
#endif
|
||||
*p = s->val.f;
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,27 +17,6 @@
|
||||
.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
|
||||
.set f30,30; .set f31,31
|
||||
|
||||
#if _CALL_ELF == 2
|
||||
#define STACK_PARAMS 96
|
||||
#else
|
||||
#define STACK_PARAMS 112
|
||||
#endif
|
||||
|
||||
#if _CALL_ELF == 2
|
||||
.section ".text"
|
||||
.type SharedStub,@function
|
||||
.globl SharedStub
|
||||
# Make the symbol hidden so that the branch from the stub does
|
||||
# not go via a PLT. This is not only better for performance,
|
||||
# but may be necessary to avoid linker errors since there is
|
||||
# no place to restore the TOC register in a sibling call.
|
||||
.hidden SharedStub
|
||||
.align 2
|
||||
SharedStub:
|
||||
0: addis 2,12,(.TOC.-0b)@ha
|
||||
addi 2,2,(.TOC.-0b)@l
|
||||
.localentry SharedStub,.-SharedStub
|
||||
#else
|
||||
.section ".text"
|
||||
.align 2
|
||||
.globl SharedStub
|
||||
@ -55,7 +34,6 @@ SharedStub:
|
||||
.type SharedStub,@function
|
||||
|
||||
.SharedStub:
|
||||
#endif
|
||||
mflr r0
|
||||
|
||||
std r4, -56(r1) # Save all GPRS
|
||||
@ -82,7 +60,7 @@ SharedStub:
|
||||
|
||||
subi r6,r1,56 # r6 --> gprData
|
||||
subi r7,r1,160 # r7 --> fprData
|
||||
addi r5,r1,STACK_PARAMS # r5 --> extra stack args
|
||||
addi r5,r1,112 # r5 --> extra stack args
|
||||
|
||||
std r0, 16(r1)
|
||||
|
||||
@ -102,11 +80,7 @@ SharedStub:
|
||||
mtlr r0
|
||||
blr
|
||||
|
||||
#if _CALL_ELF == 2
|
||||
.size SharedStub,.-SharedStub
|
||||
#else
|
||||
.size SharedStub,.-.SharedStub
|
||||
#endif
|
||||
|
||||
# Magic indicating no need for an executable stack
|
||||
.section .note.GNU-stack, "", @progbits ; .previous
|
||||
@ -83,9 +83,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
|
||||
dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles
|
||||
else {
|
||||
float *p = (float *)ap;
|
||||
#ifndef __LITTLE_ENDIAN__
|
||||
p++;
|
||||
#endif
|
||||
dp->val.f = *p;
|
||||
}
|
||||
} else { /* integer type or pointer */
|
||||
@ -155,43 +153,6 @@ PrepareAndDispatch(nsXPTCStubBase* self,
|
||||
// etc.
|
||||
// Use assembler directives to get the names right...
|
||||
|
||||
#if _CALL_ELF == 2
|
||||
# define STUB_ENTRY(n) \
|
||||
__asm__ ( \
|
||||
".section \".text\" \n\t" \
|
||||
".align 2 \n\t" \
|
||||
".if "#n" < 10 \n\t" \
|
||||
".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
|
||||
".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \
|
||||
"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \
|
||||
"0: addis 2,12,.TOC.-0b@ha \n\t" \
|
||||
"addi 2,2,.TOC.-0b@l \n\t" \
|
||||
".localentry _ZN14nsXPTCStubBase5Stub"#n"Ev,.-_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
|
||||
\
|
||||
".elseif "#n" < 100 \n\t" \
|
||||
".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \
|
||||
".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \
|
||||
"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \
|
||||
"0: addis 2,12,.TOC.-0b@ha \n\t" \
|
||||
"addi 2,2,.TOC.-0b@l \n\t" \
|
||||
".localentry _ZN14nsXPTCStubBase6Stub"#n"Ev,.-_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \
|
||||
\
|
||||
".elseif "#n" < 1000 \n\t" \
|
||||
".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \
|
||||
".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \
|
||||
"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \
|
||||
"0: addis 2,12,.TOC.-0b@ha \n\t" \
|
||||
"addi 2,2,.TOC.-0b@l \n\t" \
|
||||
".localentry _ZN14nsXPTCStubBase7Stub"#n"Ev,.-_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \
|
||||
\
|
||||
".else \n\t" \
|
||||
".err \"stub number "#n" >= 1000 not yet supported\"\n" \
|
||||
".endif \n\t" \
|
||||
\
|
||||
"li 11,"#n" \n\t" \
|
||||
"b SharedStub \n" \
|
||||
);
|
||||
#else
|
||||
# define STUB_ENTRY(n) \
|
||||
__asm__ ( \
|
||||
".section \".toc\",\"aw\" \n\t" \
|
||||
@ -234,7 +195,6 @@ __asm__ ( \
|
||||
"li 11,"#n" \n\t" \
|
||||
"b SharedStub \n" \
|
||||
);
|
||||
#endif
|
||||
|
||||
#define SENTINEL_ENTRY(n) \
|
||||
nsresult nsXPTCStubBase::Sentinel##n() \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user