RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 02:33:06 +01:00
Code Issues Projects Releases Wiki Activity

[AIX][XCOFF][Bug-Fixed] parse the parameter type of the traceback table

Browse Source 
Summary:
in the function PPCFunctionInfo::getParmsType(), there is if (Bits > 31 || (Bits > 30 && (Elt != FixedType || hasVectorParms())))

when the Bit is 31 and the Elt is not FixedType(for example the Elt is FloatingType) , the 31th bit will be not encoded, it leave the bit as zero, when the function Expected<SmallString<32>> XCOFF::parseParmsType() the original implement
**// unsigned ParmsNum = FixedParmsNum + FloatingParmsNum;

while (Bits < 32 && ParsedNum < ParmsNum) {
...
}//**
it will look the 31 bits (zero) as FixedType. which should be FloatingType,  and get a error.

Reviewers: Jason Liu,ZarkoCA

Differential Revision: https://reviews.llvm.org/D105023
This commit is contained in:
zhijian 2021-07-15 16:54:22 -04:00
parent 01d9855563
commit 91dbc78882
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/BinaryFormat/XCOFF.cpp
View File

@ -117,7 +117,15 @@ Expected<SmallString<32>> XCOFF::parseParmsType(uint32_t Value,
unsigned ParsedNum = 0; unsigned ParsedNum = 0;
unsigned ParmsNum = FixedParmsNum + FloatingParmsNum; unsigned ParmsNum = FixedParmsNum + FloatingParmsNum;
while (Bits < 32 && ParsedNum < ParmsNum) { // In the function PPCFunctionInfo::getParmsType(), when there are no vector
// parameters, the 31st bit of ParmsType is always zero even if it indicates a
// floating point parameter. The parameter type information is lost. There
// are only 8 GPRs used for parameters passing, the floating parameters
// also occupy GPRs if there are available, so the 31st bit can never be a
// fixed parameter. At the same time, we also do not know whether the zero of
// the 31st bit indicates a float or double parameter type here. Therefore, we
// ignore the 31st bit.
while (Bits < 31 && ParsedNum < ParmsNum) {
if (++ParsedNum > 1) if (++ParsedNum > 1)
ParmsType += ", "; ParmsType += ", ";
if ((Value & TracebackTable::ParmTypeIsFloatingBit) == 0) { if ((Value & TracebackTable::ParmTypeIsFloatingBit) == 0) {

34
test/CodeGen/PowerPC/aix-emit-tracebacktable.ll
View File

@ -133,6 +133,13 @@ entry:
ret double %add10 ret double %add10
} }
define i32 @foo(i32 %i1, i32 %i2, i32 %i3, i32 %i4, i32 %i5, i32 %i6, i32 %i7, float %f1, float %f2, float %f3, float %f4, float %f5, float %f6, float %f7, float %f8, float %f9, float %f10, float %f11, float %f12, float %f13, float %f14, i32 %i8) {
entry:
%i1.addr = alloca i32, align 4
store i32 %i1, i32* %i1.addr, align 4
ret i32 %i1
}
; CHECK-ASM-LABEL: ._Z10add_structifd1SP2SD1Di:{{[[:space:]] *}}# %bb.0: ; CHECK-ASM-LABEL: ._Z10add_structifd1SP2SD1Di:{{[[:space:]] *}}# %bb.0:
; CHECK-FUNC-LABEL: csect ._Z10add_structifd1SP2SD1Di[PR],2{{[[:space:]] *}}# %bb.0: ; CHECK-FUNC-LABEL: csect ._Z10add_structifd1SP2SD1Di[PR],2{{[[:space:]] *}}# %bb.0:
; COMMON-NEXT: lwz 4, L..C0(2) ; COMMON-NEXT: lwz 4, L..C0(2)
@ -216,3 +223,30 @@ entry:
; COMMON-NEXT: .vbyte 2, 0x0016 # Function name len = 22 ; COMMON-NEXT: .vbyte 2, 0x0016 # Function name len = 22
; COMMON-NEXT: .byte "_Z7add_bari1SfdP2SD1Di" # Function Name ; COMMON-NEXT: .byte "_Z7add_bari1SfdP2SD1Di" # Function Name
; COMMON-NEXT: # -- End function ; COMMON-NEXT: # -- End function
; CHECK-ASM-LABEL: .foo:{{[[:space:]] *}}# %bb.0:
; CHECK-FUNC-LABEL: .csect .foo[PR],2{{[[:space:]] *}}# %bb.0:
; COMMON: stw 3, -4(1)
; COMMON-NEXT: blr
; COMMON-NEXT:L..foo0:
; COMMON-NEXT: .vbyte 4, 0x00000000 # Traceback table begin
; COMMON-NEXT: .byte 0x00 # Version = 0
; COMMON-NEXT: .byte 0x09 # Language = CPlusPlus
; COMMON-NEXT: .byte 0x20 # -IsGlobaLinkage, -IsOutOfLineEpilogOrPrologue
; COMMON-NEXT: # +HasTraceBackTableOffset, -IsInternalProcedure
; COMMON-NEXT: # -HasControlledStorage, -IsTOCless
; COMMON-NEXT: # -IsFloatingPointPresent
; COMMON-NEXT: # -IsFloatingPointOperationLogOrAbortEnabled
; COMMON-NEXT: .byte 0x40 # -IsInterruptHandler, +IsFunctionNamePresent, -IsAllocaUsed
; COMMON-NEXT: # OnConditionDirective = 0, -IsCRSaved, -IsLRSaved
; COMMON-NEXT: .byte 0x80 # +IsBackChainStored, -IsFixup, NumOfFPRsSaved = 0
; COMMON-NEXT: .byte 0x00 # -HasExtensionTable, -HasVectorInfo, NumOfGPRsSaved = 0
; COMMON-NEXT: .byte 0x07 # NumberOfFixedParms = 7
; COMMON-NEXT: .byte 0x1b # NumberOfFPParms = 13, +HasParmsOnStack
; COMMON-NEXT: .vbyte 4, 0x01555554 # Parameter type = i, i, i, i, i, i, i, f, f, f, f, f, f, f, f, f, f, f, f, ...
; CHECK-ASM-NEXT: .vbyte 4, L..foo0-.foo # Function size
; CHECK-FUNC-NEXT: .vbyte 4, L..foo0-.foo[PR] # Function size
; COMMON-NEXT: .vbyte 2, 0x0003 # Function name len = 3
; COMMON-NEXT: .byte "foo" # Function Name
; COMMON-NEXT: # -- End function