tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue with CodeSourcery gcc requiring assembly functions to have a .type define inorder to support interworking (calling from thumb(C code) to ARM code (hadn written assembly). We had to add a macro as the .type directive is not supported, or needed, by Xcode. All ARM .S files need to be updated. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11167 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
andrewfish 2010-12-15 00:58:34 +00:00
parent 5792e320d3
commit e7cb469e3a
9 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MdePkg/Include/Arm/ProcessorBind.h
View File

@ -110,6 +110,20 @@ typedef INT32 INTN;
/// Define this macro to unify the usage.
///
#define ASM_GLOBAL .globl
#if !defined(__APPLE__)
///
/// ARM EABI defines that the linker should not manipulate call relocations
/// (do bl/blx conversion) unless the target symbol has function type.
/// CodeSourcery 2010.09 started requiring the .type to function properly
///
#define INTERWORK_FUNC(func__) .type ASM_PFX(func__), %function
#else
//
// .type not supported by Apple Xcode tools
//
#define INTERWORK_FUNC(func__)
#endif
#endif
/**

1
MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S
View File

@ -17,6 +17,7 @@
.text
.p2align 2
.globl ASM_PFX(CpuFlushTlb)
INTERWORK_FUNC(CpuFlushTlb)
#/**
# Flushes all the Translation Lookaside Buffers(TLB) entries in a CPU.

1
MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S
View File

@ -17,6 +17,7 @@
.text
.p2align 2
.globl ASM_PFX(CpuSleep)
INTERWORK_FUNC(CpuSleep)
#/**
# Places the CPU in a sleep state until an interrupt is received.

1
MdePkg/Library/BaseLib/Arm/CpuBreakpoint.S
View File

@ -17,6 +17,7 @@
.text
.p2align 2
.globl ASM_PFX(CpuBreakpoint)
INTERWORK_FUNC(CpuBreakpoint)
#/**
# Generates a breakpoint on the CPU.

1
MdePkg/Library/BaseLib/Arm/DisableInterrupts.S
View File

@ -17,6 +17,7 @@
.text
.p2align 2
.globl ASM_PFX(DisableInterrupts)
INTERWORK_FUNC(DisableInterrupts)
#/**
# Disables CPU interrupts.

1
MdePkg/Library/BaseLib/Arm/EnableInterrupts.S
View File

@ -17,6 +17,7 @@
.text
.p2align 2
.globl ASM_PFX(EnableInterrupts)
INTERWORK_FUNC(EnableInterrupts)
#/**

5
MdePkg/Library/BaseLib/Arm/GetInterruptsState.S
View File

@ -16,7 +16,8 @@
.text
.p2align 2
.globl _GetInterruptState
.globl ASM_PFX(GetInterruptState)
INTERWORK_FUNC(GetInterruptState)
#/**
# Retrieves the current CPU interrupt state.
@ -35,7 +36,7 @@
# VOID
# );
#
_GetInterruptState:
ASM_PFX(GetInterruptState):
mrs R0, CPSR
tst R0, #0x80 @Check if IRQ is enabled.
moveq R0, #1

26
MdePkg/Library/BaseLib/Arm/Math64.S
View File

@ -20,6 +20,8 @@
.text
.align 2
.globl ASM_PFX(InternalMathLShiftU64)
INTERWORK_FUNC(InternalMathLShiftU64)
ASM_PFX(InternalMathLShiftU64):
stmfd sp!, {r4, r5, r6}
mov r6, r1
@ -37,6 +39,8 @@ ASM_PFX(InternalMathLShiftU64):
.align 2
.globl ASM_PFX(InternalMathRShiftU64)
INTERWORK_FUNC(InternalMathRShiftU64)
ASM_PFX(InternalMathRShiftU64):
stmfd sp!, {r4, r5, r6}
mov r5, r0
@ -54,6 +58,8 @@ ASM_PFX(InternalMathRShiftU64):
.align 2
.globl ASM_PFX(InternalMathARShiftU64)
INTERWORK_FUNC(InternalMathARShiftU64)
ASM_PFX(InternalMathARShiftU64):
stmfd sp!, {r4, r5, r6}
mov r5, r0
@ -71,6 +77,8 @@ ASM_PFX(InternalMathARShiftU64):
.align 2
.globl ASM_PFX(InternalMathLRotU64)
INTERWORK_FUNC(InternalMathLRotU64)
ASM_PFX(InternalMathLRotU64):
stmfd sp!, {r4, r5, r6, r7, lr}
add r7, sp, #12
@ -96,6 +104,8 @@ ASM_PFX(InternalMathLRotU64):
.align 2
.globl ASM_PFX(InternalMathRRotU64)
INTERWORK_FUNC(InternalMathRRotU64)
ASM_PFX(InternalMathRRotU64):
stmfd sp!, {r4, r5, r6, r7, lr}
add r7, sp, #12
@ -120,6 +130,8 @@ ASM_PFX(InternalMathRRotU64):
.align 2
.globl ASM_PFX(InternalMathMultU64x32)
INTERWORK_FUNC(InternalMathMultU64x32)
ASM_PFX(InternalMathMultU64x32):
stmfd sp!, {r7, lr}
add r7, sp, #0
@ -133,6 +145,8 @@ ASM_PFX(InternalMathMultU64x32):
.align 2
.globl ASM_PFX(InternalMathMultU64x64)
INTERWORK_FUNC(InternalMathMultU64x64)
ASM_PFX(InternalMathMultU64x64):
stmfd sp!, {r7, lr}
add r7, sp, #0
@ -145,6 +159,8 @@ ASM_PFX(InternalMathMultU64x64):
.align 2
.globl ASM_PFX(InternalMathDivU64x32)
INTERWORK_FUNC(InternalMathDivU64x32)
ASM_PFX(InternalMathDivU64x32):
stmfd sp!, {r7, lr}
add r7, sp, #0
@ -155,6 +171,8 @@ ASM_PFX(InternalMathDivU64x32):
.align 2
.globl ASM_PFX(InternalMathModU64x32)
INTERWORK_FUNC(InternalMathModU64x32)
ASM_PFX(InternalMathModU64x32):
stmfd sp!, {r7, lr}
add r7, sp, #0
@ -165,6 +183,8 @@ ASM_PFX(InternalMathModU64x32):
.align 2
.globl ASM_PFX(InternalMathDivRemU64x32)
INTERWORK_FUNC(InternalMathDivRemU64x32)
ASM_PFX(InternalMathDivRemU64x32):
stmfd sp!, {r4, r5, r6, r7, lr}
add r7, sp, #12
@ -192,6 +212,8 @@ L22:
.align 2
.globl ASM_PFX(InternalMathDivRemU64x64)
INTERWORK_FUNC(InternalMathDivRemU64x64)
ASM_PFX(InternalMathDivRemU64x64):
stmfd sp!, {r4, r5, r6, r7, lr}
add r7, sp, #12
@ -217,6 +239,8 @@ L26:
.align 2
.globl ASM_PFX(InternalMathDivRemS64x64)
INTERWORK_FUNC(InternalMathDivRemS64x64)
ASM_PFX(InternalMathDivRemS64x64):
stmfd sp!, {r4, r5, r6, r7, lr}
add r7, sp, #12
@ -242,6 +266,8 @@ L30:
.align 2
.globl ASM_PFX(InternalMathSwapBytes64)
INTERWORK_FUNC(InternalMathSwapBytes64)
ASM_PFX(InternalMathSwapBytes64):
@ args = 0, pretend = 0, frame = 0
@ frame_needed = 1, uses_anonymous_args = 0

3
MdePkg/Library/BaseLib/Arm/SetJumpLongJump.S
View File

@ -15,7 +15,10 @@
.p2align 2
.globl ASM_PFX(SetJump)
INTERWORK_FUNC(SetJump)
.globl ASM_PFX(InternalLongJump)
INTERWORK_FUNC(InternalLongJump)
#/**
# Saves the current CPU context that can be restored with a call to LongJump() and returns 0.#