6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-15 21:24:00 +00:00
Code Issues Projects Releases Wiki Activity

llvm-objdump: Indent unwind info contents.

Browse Source 
Unwind info contents were indented at the same level as function table
contents. That's a bit confusing because the unwind info is pointed by
function table. In other places we usually increment indentation depth
by one when dereferncing a pointer.

This patch also removes extraneous newlines between function tables.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202879 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rui Ueyama
2014-03-04 19:23:56 +00:00
parent 1d8f551946
commit afee151fe8
2 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
test/tools/llvm-objdump/win64-unwind-data.test
View File

@ -55,53 +55,53 @@ OBJ-NEXT: 0x07: UOP_AllocLarge 8190
OBJ-NEXT: 0x00: UOP_PushMachFrame w/o error code
EXE: Function Table:
EXE: Start Address: 0x1000
EXE: End Address: 0x101b
EXE: Unwind Info Address: 0x2000
EXE: Version: 1
EXE: Flags: 1 UNW_ExceptionHandler
EXE: Size of prolog: 18
EXE: Number of Codes: 8
EXE: Frame register: RBX
EXE: Frame offset: 0
EXE: Unwind Codes:
EXE: 0x12: UOP_SetFPReg
EXE: 0x0f: UOP_PushNonVol RBX
EXE: 0x0e: UOP_SaveXMM128 XMM8 [0x0000]
EXE: 0x09: UOP_SaveNonVol RSI [0x0010]
EXE: 0x04: UOP_AllocSmall 24
EXE: 0x00: UOP_PushMachFrame w/o error code
EXE-NEXT: Start Address: 0x1000
EXE-NEXT: End Address: 0x101b
EXE-NEXT: Unwind Info Address: 0x2000
EXE-NEXT: Version: 1
EXE-NEXT: Flags: 1 UNW_ExceptionHandler
EXE-NEXT: Size of prolog: 18
EXE-NEXT: Number of Codes: 8
EXE-NEXT: Frame register: RBX
EXE-NEXT: Frame offset: 0
EXE-NEXT: Unwind Codes:
EXE-NEXT: 0x12: UOP_SetFPReg
EXE-NEXT: 0x0f: UOP_PushNonVol RBX
EXE-NEXT: 0x0e: UOP_SaveXMM128 XMM8 [0x0000]
EXE-NEXT: 0x09: UOP_SaveNonVol RSI [0x0010]
EXE-NEXT: 0x04: UOP_AllocSmall 24
EXE-NEXT: 0x00: UOP_PushMachFrame w/o error code
EXE: Function Table:
EXE: Start Address: 0x1012
EXE: End Address: 0x1012
EXE: Unwind Info Address: 0x201c
EXE: Version: 1
EXE: Flags: 4 UNW_ChainInfo
EXE: Size of prolog: 0
EXE: Number of Codes: 0
EXE: No frame pointer used
EXE-NEXT: Start Address: 0x1012
EXE-NEXT: End Address: 0x1012
EXE-NEXT: Unwind Info Address: 0x201c
EXE-NEXT: Version: 1
EXE-NEXT: Flags: 4 UNW_ChainInfo
EXE-NEXT: Size of prolog: 0
EXE-NEXT: Number of Codes: 0
EXE-NEXT: No frame pointer used
EXE: Function Table:
EXE: Start Address: 0x101b
EXE: End Address: 0x101c
EXE: Unwind Info Address: 0x202c
EXE: Version: 1
EXE: Flags: 0
EXE: Size of prolog: 0
EXE: Number of Codes: 0
EXE: No frame pointer used
EXE-NEXT: Start Address: 0x101b
EXE-NEXT: End Address: 0x101c
EXE-NEXT: Unwind Info Address: 0x202c
EXE-NEXT: Version: 1
EXE-NEXT: Flags: 0
EXE-NEXT: Size of prolog: 0
EXE-NEXT: Number of Codes: 0
EXE-NEXT: No frame pointer used
EXE: Function Table:
EXE: Start Address: 0x101c
EXE: End Address: 0x1039
EXE: Unwind Info Address: 0x2034
EXE: Version: 1
EXE: Flags: 0
EXE: Size of prolog: 14
EXE: Number of Codes: 6
EXE: No frame pointer used
EXE: Unwind Codes:
EXE: 0x0e: UOP_AllocLarge 8454128
EXE: 0x07: UOP_AllocLarge 8190
EXE: 0x00: UOP_PushMachFrame w/o error code
EXE-NEXT: Start Address: 0x101c
EXE-NEXT: End Address: 0x1039
EXE-NEXT: Unwind Info Address: 0x2034
EXE-NEXT: Version: 1
EXE-NEXT: Flags: 0
EXE-NEXT: Size of prolog: 14
EXE-NEXT: Number of Codes: 6
EXE-NEXT: No frame pointer used
EXE-NEXT: Unwind Codes:
EXE-NEXT: 0x0e: UOP_AllocLarge 8454128
EXE-NEXT: 0x07: UOP_AllocLarge 8190
EXE-NEXT: 0x00: UOP_PushMachFrame w/o error code

4
tools/llvm-objdump/COFFDump.cpp
View File

@ -447,7 +447,7 @@ static void printWin64EHUnwindInfo(const Win64EH::UnwindInfo *UI) {
printAllUnwindCodes(ArrayRef<UnwindCode>(&UI->UnwindCodes[0], UI->NumCodes));
outs() << "\n\n";
outs() << "\n";
outs().flush();
}
@ -460,7 +460,7 @@ static void printRuntimeFunction(const COFFObjectFile *Obj,
outs() << "Function Table:\n"
<< format(" Start Address: 0x%04x\n", RF.StartAddress)
<< format(" End Address: 0x%04x\n", RF.EndAddress)
<< format(" Unwind Info Address: 0x%04x\n\n", RF.UnwindInfoOffset);
<< format(" Unwind Info Address: 0x%04x\n", RF.UnwindInfoOffset);
uintptr_t addr;
if (Obj->getRvaPtr(RF.UnwindInfoOffset, addr))
return;