[llvm] 7761958 - [XCOFF] Write source language ID and CPU version ID into C_FILE symbol.
via llvm-commits
llvm-commits at lists.llvm.org
Sun Jul 23 21:35:49 PDT 2023
Author: esmeyi
Date: 2023-07-24T00:35:24-04:00
New Revision: 776195865d4f2bdab47ac8948fc9281336e88349
URL: https://github.com/llvm/llvm-project/commit/776195865d4f2bdab47ac8948fc9281336e88349
DIFF: https://github.com/llvm/llvm-project/commit/776195865d4f2bdab47ac8948fc9281336e88349.diff
LOG: [XCOFF] Write source language ID and CPU version ID into C_FILE symbol.
Summary: The source language ID and CPU version ID are required by debuggers on AIX. AIX's system assembler determines the source language ID based on the source file's name suffix, and the behavior in this patch is consistent with it.
Reviewed By: shchenz
Differential Revision: https://reviews.llvm.org/D155684
Added:
llvm/test/CodeGen/PowerPC/aix-filename-c.ll
llvm/test/CodeGen/PowerPC/aix-filename-cpp.ll
llvm/test/CodeGen/PowerPC/aix-filename-f.ll
Modified:
llvm/include/llvm/BinaryFormat/XCOFF.h
llvm/lib/MC/XCOFFObjectWriter.cpp
llvm/test/CodeGen/PowerPC/aix-extern-weak.ll
llvm/test/CodeGen/PowerPC/aix-extern.ll
llvm/test/CodeGen/PowerPC/aix-func-dsc-gen.ll
llvm/test/CodeGen/PowerPC/aix-llvm-intrinsic.ll
llvm/test/CodeGen/PowerPC/aix-tls-xcoff-reloc-large.ll
llvm/test/CodeGen/PowerPC/aix-tls-xcoff-reloc.ll
llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll
llvm/test/CodeGen/PowerPC/aix-weak.ll
llvm/test/CodeGen/PowerPC/aix-xcoff-data.ll
llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll
llvm/tools/llvm-readobj/XCOFFDumper.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/BinaryFormat/XCOFF.h b/llvm/include/llvm/BinaryFormat/XCOFF.h
index 5774e01429d37e..19d44a5ac57f12 100644
--- a/llvm/include/llvm/BinaryFormat/XCOFF.h
+++ b/llvm/include/llvm/BinaryFormat/XCOFF.h
@@ -328,6 +328,7 @@ enum CFileStringType : uint8_t {
enum CFileLangId : uint8_t {
TB_C = 0, ///< C language.
+ TB_Fortran = 1, ///< Fortran language.
TB_CPLUSPLUS = 9 ///< C++ language.
};
diff --git a/llvm/lib/MC/XCOFFObjectWriter.cpp b/llvm/lib/MC/XCOFFObjectWriter.cpp
index 30fa72703275f0..036210d6b0efa2 100644
--- a/llvm/lib/MC/XCOFFObjectWriter.cpp
+++ b/llvm/lib/MC/XCOFFObjectWriter.cpp
@@ -1104,11 +1104,36 @@ void XCOFFObjectWriter::writeRelocations() {
void XCOFFObjectWriter::writeSymbolTable(const MCAsmLayout &Layout) {
// Write C_FILE symbols.
- // The n_name of a C_FILE symbol is the source file's name when no auxiliary
- // entries are present.
for (const std::pair<std::string, size_t> &F : FileNames) {
- writeSymbolEntry(F.first, /*Value=*/0, XCOFF::ReservedSectionNum::N_DEBUG,
- /*SymbolType=*/0, XCOFF::C_FILE,
+ // The n_name of a C_FILE symbol is the source file's name when no auxiliary
+ // entries are present.
+ StringRef FileName = F.first;
+
+ // For C_FILE symbols, the Source Language ID overlays the high-order byte
+ // of the SymbolType field, and the CPU Version ID is defined as the
+ // low-order byte.
+ // AIX's system assembler determines the source language ID based on the
+ // source file's name suffix, and the behavior here is consistent with it.
+ uint8_t LangID;
+ if (FileName.ends_with(".c"))
+ LangID = XCOFF::TB_C;
+ else if (FileName.ends_with_insensitive(".f") ||
+ FileName.ends_with_insensitive(".f77") ||
+ FileName.ends_with_insensitive(".f90") ||
+ FileName.ends_with_insensitive(".f95") ||
+ FileName.ends_with_insensitive(".f03") ||
+ FileName.ends_with_insensitive(".f08"))
+ LangID = XCOFF::TB_Fortran;
+ else
+ LangID = XCOFF::TB_CPLUSPLUS;
+ uint8_t CpuID;
+ if (is64Bit())
+ CpuID = XCOFF::TCPU_PPC64;
+ else
+ CpuID = XCOFF::TCPU_COM;
+
+ writeSymbolEntry(FileName, /*Value=*/0, XCOFF::ReservedSectionNum::N_DEBUG,
+ /*SymbolType=*/(LangID << 8) | CpuID, XCOFF::C_FILE,
/*NumberOfAuxEntries=*/0);
}
diff --git a/llvm/test/CodeGen/PowerPC/aix-extern-weak.ll b/llvm/test/CodeGen/PowerPC/aix-extern-weak.ll
index e343f7011a311e..154bd6418947dc 100644
--- a/llvm/test/CodeGen/PowerPC/aix-extern-weak.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-extern-weak.ll
@@ -68,8 +68,9 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: Name: <stdin>
; CHECKSYM-NEXT: Value (SymbolTableIndex): 0x0
; CHECKSYM-NEXT: Section: N_DEBUG
-; CHECKSYM-NEXT: Source Language ID: TB_C (0x0)
-; CHECKSYM-NEXT: CPU Version ID: 0x0
+; CHECKSYM-NEXT: Source Language ID: TB_CPLUSPLUS (0x9)
+; CHECKSYM32-NEXT: CPU Version ID: TCPU_COM (0x3)
+; CHECKSYM64-NEXT: CPU Version ID: TCPU_PPC64 (0x2)
; CHECKSYM-NEXT: StorageClass: C_FILE (0x67)
; CHECKSYM-NEXT: NumberOfAuxEntries: 0
; CHECKSYM-NEXT: }
diff --git a/llvm/test/CodeGen/PowerPC/aix-extern.ll b/llvm/test/CodeGen/PowerPC/aix-extern.ll
index 4666abf560b5a7..23bf7ecab350c0 100644
--- a/llvm/test/CodeGen/PowerPC/aix-extern.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-extern.ll
@@ -91,8 +91,9 @@ declare i32 @bar_extern(ptr)
; CHECKSYM-NEXT: Name: <stdin>
; CHECKSYM-NEXT: Value (SymbolTableIndex): 0x0
; CHECKSYM-NEXT: Section: N_DEBUG
-; CHECKSYM-NEXT: Source Language ID: TB_C (0x0)
-; CHECKSYM-NEXT: CPU Version ID: 0x0
+; CHECKSYM-NEXT: Source Language ID: TB_CPLUSPLUS (0x9)
+; CHECKSYM32-NEXT: CPU Version ID: TCPU_COM (0x3)
+; CHECKSYM64-NEXT: CPU Version ID: TCPU_PPC64 (0x2)
; CHECKSYM-NEXT: StorageClass: C_FILE (0x67)
; CHECKSYM-NEXT: NumberOfAuxEntries: 0
; CHECKSYM-NEXT: }
diff --git a/llvm/test/CodeGen/PowerPC/aix-filename-c.ll b/llvm/test/CodeGen/PowerPC/aix-filename-c.ll
new file mode 100644
index 00000000000000..2adc51cc2aeccd
--- /dev/null
+++ b/llvm/test/CodeGen/PowerPC/aix-filename-c.ll
@@ -0,0 +1,11 @@
+; RUN: llc -verify-machineinstrs -mtriple powerpc-ibm-aix-xcoff -filetype=obj -o %t.o < %s
+; RUN: llvm-readobj --symbols %t.o | FileCheck --check-prefixes=OBJ,OBJ32 %s
+; RUN: llc -verify-machineinstrs -mtriple powerpc64-ibm-aix-xcoff -filetype=obj -o %t64.o < %s
+; RUN: llvm-readobj --symbols %t64.o | FileCheck --check-prefixes=OBJ,OBJ64 %s
+
+source_filename = "1.c"
+
+; OBJ: Name: 1.c
+; OBJ: Source Language ID: TB_C (0x0)
+; OBJ32: CPU Version ID: TCPU_COM (0x3)
+; OBJ64: CPU Version ID: TCPU_PPC64 (0x2)
diff --git a/llvm/test/CodeGen/PowerPC/aix-filename-cpp.ll b/llvm/test/CodeGen/PowerPC/aix-filename-cpp.ll
new file mode 100644
index 00000000000000..22496be1dfc888
--- /dev/null
+++ b/llvm/test/CodeGen/PowerPC/aix-filename-cpp.ll
@@ -0,0 +1,11 @@
+; RUN: llc -verify-machineinstrs -mtriple powerpc-ibm-aix-xcoff -filetype=obj -o %t.o < %s
+; RUN: llvm-readobj --symbols %t.o | FileCheck --check-prefixes=OBJ,OBJ32 %s
+; RUN: llc -verify-machineinstrs -mtriple powerpc64-ibm-aix-xcoff -filetype=obj -o %t64.o < %s
+; RUN: llvm-readobj --symbols %t64.o | FileCheck --check-prefixes=OBJ,OBJ64 %s
+
+source_filename = "1.cpp"
+
+; OBJ: Name: 1.cpp
+; OBJ: Source Language ID: TB_CPLUSPLUS (0x9)
+; OBJ32: CPU Version ID: TCPU_COM (0x3)
+; OBJ64: CPU Version ID: TCPU_PPC64 (0x2)
diff --git a/llvm/test/CodeGen/PowerPC/aix-filename-f.ll b/llvm/test/CodeGen/PowerPC/aix-filename-f.ll
new file mode 100644
index 00000000000000..914c4facc3cf55
--- /dev/null
+++ b/llvm/test/CodeGen/PowerPC/aix-filename-f.ll
@@ -0,0 +1,11 @@
+; RUN: llc -verify-machineinstrs -mtriple powerpc-ibm-aix-xcoff -filetype=obj -o %t.o < %s
+; RUN: llvm-readobj --symbols %t.o | FileCheck --check-prefixes=OBJ,OBJ32 %s
+; RUN: llc -verify-machineinstrs -mtriple powerpc64-ibm-aix-xcoff -filetype=obj -o %t64.o < %s
+; RUN: llvm-readobj --symbols %t64.o | FileCheck --check-prefixes=OBJ,OBJ64 %s
+
+source_filename = "1.f95"
+
+; OBJ: Name: 1.f95
+; OBJ: Source Language ID: TB_Fortran (0x1)
+; OBJ32: CPU Version ID: TCPU_COM (0x3)
+; OBJ64: CPU Version ID: TCPU_PPC64 (0x2)
diff --git a/llvm/test/CodeGen/PowerPC/aix-func-dsc-gen.ll b/llvm/test/CodeGen/PowerPC/aix-func-dsc-gen.ll
index f774870aeedbff..23fb51e9444243 100644
--- a/llvm/test/CodeGen/PowerPC/aix-func-dsc-gen.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-func-dsc-gen.ll
@@ -16,8 +16,8 @@ entry:
; CHECK-NEXT: Name: <stdin>
; CHECK-NEXT: Value (SymbolTableIndex): 0x0
; CHECK-NEXT: Section: N_DEBUG
-; CHECK-NEXT: Source Language ID: TB_C (0x0)
-; CHECK-NEXT: CPU Version ID: 0x0
+; CHECK-NEXT: Source Language ID: TB_CPLUSPLUS (0x9)
+; CHECK-NEXT: CPU Version ID: TCPU_COM (0x3)
; CHECK-NEXT: StorageClass: C_FILE (0x67)
; CHECK-NEXT: NumberOfAuxEntries: 0
; CHECK-NEXT: }
diff --git a/llvm/test/CodeGen/PowerPC/aix-llvm-intrinsic.ll b/llvm/test/CodeGen/PowerPC/aix-llvm-intrinsic.ll
index b4b695138376df..09aec55a5b3dfb 100644
--- a/llvm/test/CodeGen/PowerPC/aix-llvm-intrinsic.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-llvm-intrinsic.ll
@@ -43,8 +43,9 @@ declare void @llvm.memset.p0.i32(ptr nocapture writeonly, i8, i32, i1 immarg)
; CHECKSYM-NEXT: Name: <stdin>
; CHECKSYM-NEXT: Value (SymbolTableIndex): 0x0
; CHECKSYM-NEXT: Section: N_DEBUG
-; CHECKSYM-NEXT: Source Language ID: TB_C (0x0)
-; CHECKSYM-NEXT: CPU Version ID: 0x0
+; CHECKSYM-NEXT: Source Language ID: TB_CPLUSPLUS (0x9)
+; CHECKSYM32-NEXT: CPU Version ID: TCPU_COM (0x3)
+; CHECKSYM64-NEXT: CPU Version ID: TCPU_PPC64 (0x2)
; CHECKSYM-NEXT: StorageClass: C_FILE (0x67)
; CHECKSYM-NEXT: NumberOfAuxEntries: 0
; CHECKSYM-NEXT: }
diff --git a/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-reloc-large.ll b/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-reloc-large.ll
index a9984b81e35603..2dae8ee96e20d1 100644
--- a/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-reloc-large.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-reloc-large.ll
@@ -213,8 +213,8 @@ entry:
; SYM-NEXT: Name: <stdin>
; SYM-NEXT: Value (SymbolTableIndex): 0x0
; SYM-NEXT: Section: N_DEBUG
-; SYM-NEXT: Source Language ID: TB_C (0x0)
-; SYM-NEXT: CPU Version ID: 0x0
+; SYM-NEXT: Source Language ID: TB_CPLUSPLUS (0x9)
+; SYM-NEXT: CPU Version ID: TCPU_COM (0x3)
; SYM-NEXT: StorageClass: C_FILE (0x67)
; SYM-NEXT: NumberOfAuxEntries: 0
; SYM-NEXT: }
diff --git a/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-reloc.ll b/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-reloc.ll
index d1223325df2920..0779686b54f3ac 100644
--- a/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-reloc.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-reloc.ll
@@ -174,8 +174,8 @@ entry:
; SYM-NEXT: Name: <stdin>
; SYM-NEXT: Value (SymbolTableIndex): 0x0
; SYM-NEXT: Section: N_DEBUG
-; SYM-NEXT: Source Language ID: TB_C (0x0)
-; SYM-NEXT: CPU Version ID: 0x0
+; SYM-NEXT: Source Language ID: TB_CPLUSPLUS (0x9)
+; SYM-NEXT: CPU Version ID: TCPU_COM (0x3)
; SYM-NEXT: StorageClass: C_FILE (0x67)
; SYM-NEXT: NumberOfAuxEntries: 0
; SYM-NEXT: }
diff --git a/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll b/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll
index 6b3de05c583a00..3bbdadcdb7bae5 100644
--- a/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll
@@ -69,8 +69,8 @@
; SYMS-NEXT: Name: <stdin>
; SYMS-NEXT: Value (SymbolTableIndex): 0x0
; SYMS-NEXT: Section: N_DEBUG
-; SYMS-NEXT: Source Language ID: TB_C (0x0)
-; SYMS-NEXT: CPU Version ID: 0x0
+; SYMS-NEXT: Source Language ID: TB_CPLUSPLUS (0x9)
+; SYMS-NEXT: CPU Version ID: TCPU_COM (0x3)
; SYMS-NEXT: StorageClass: C_FILE (0x67)
; SYMS-NEXT: NumberOfAuxEntries: 0
; SYMS-NEXT: }
diff --git a/llvm/test/CodeGen/PowerPC/aix-weak.ll b/llvm/test/CodeGen/PowerPC/aix-weak.ll
index e01fe63ec5f0d8..bc098b83e372f2 100644
--- a/llvm/test/CodeGen/PowerPC/aix-weak.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-weak.ll
@@ -103,8 +103,9 @@ entry:
; CHECKSYM-NEXT: Name: <stdin>
; CHECKSYM-NEXT: Value (SymbolTableIndex): 0x0
; CHECKSYM-NEXT: Section: N_DEBUG
-; CHECKSYM-NEXT: Source Language ID: TB_C (0x0)
-; CHECKSYM-NEXT: CPU Version ID: 0x0
+; CHECKSYM-NEXT: Source Language ID: TB_CPLUSPLUS (0x9)
+; CHECKSYM32-NEXT: CPU Version ID: TCPU_COM (0x3)
+; CHECKSYM64-NEXT: CPU Version ID: TCPU_PPC64 (0x2)
; CHECKSYM-NEXT: StorageClass: C_FILE (0x67)
; CHECKSYM-NEXT: NumberOfAuxEntries: 0
; CHECKSYM-NEXT: }
diff --git a/llvm/test/CodeGen/PowerPC/aix-xcoff-data.ll b/llvm/test/CodeGen/PowerPC/aix-xcoff-data.ll
index bd050ca5ae9073..49135499386701 100644
--- a/llvm/test/CodeGen/PowerPC/aix-xcoff-data.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-xcoff-data.ll
@@ -211,8 +211,9 @@
; SYMS-NEXT: Name: <stdin>
; SYMS-NEXT: Value (SymbolTableIndex): 0x0
; SYMS-NEXT: Section: N_DEBUG
-; SYMS-NEXT: Source Language ID: TB_C (0x0)
-; SYMS-NEXT: CPU Version ID: 0x0
+; SYMS-NEXT: Source Language ID: TB_CPLUSPLUS (0x9)
+; SYMS32-NEXT: CPU Version ID: TCPU_COM (0x3)
+; SYMS64-NEXT: CPU Version ID: TCPU_PPC64 (0x2)
; SYMS-NEXT: StorageClass: C_FILE (0x67)
; SYMS-NEXT: NumberOfAuxEntries: 0
; SYMS-NEXT: }
diff --git a/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll b/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll
index 782b078a0e4973..97a5fbcf78f5d4 100644
--- a/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll
@@ -162,8 +162,9 @@ declare i32 @bar(i32)
; SYM-NEXT: Name: <stdin>
; SYM-NEXT: Value (SymbolTableIndex): 0x0
; SYM-NEXT: Section: N_DEBUG
-; SYM-NEXT: Source Language ID: TB_C (0x0)
-; SYM-NEXT: CPU Version ID: 0x0
+; SYM-NEXT: Source Language ID: TB_CPLUSPLUS (0x9)
+; SYM32-NEXT: CPU Version ID: TCPU_COM (0x3)
+; SYM64-NEXT: CPU Version ID: TCPU_PPC64 (0x2)
; SYM-NEXT: StorageClass: C_FILE (0x67)
; SYM-NEXT: NumberOfAuxEntries: 0
; SYM-NEXT: }
diff --git a/llvm/tools/llvm-readobj/XCOFFDumper.cpp b/llvm/tools/llvm-readobj/XCOFFDumper.cpp
index 8f4e55be2d9159..74ebcc4ec7d85c 100644
--- a/llvm/tools/llvm-readobj/XCOFFDumper.cpp
+++ b/llvm/tools/llvm-readobj/XCOFFDumper.cpp
@@ -710,7 +710,7 @@ static StringRef GetSymbolValueName(XCOFF::StorageClass SC) {
const EnumEntry<XCOFF::CFileLangId> CFileLangIdClass[] = {
#define ECase(X) \
{ #X, XCOFF::X }
- ECase(TB_C), ECase(TB_CPLUSPLUS)
+ ECase(TB_C), ECase(TB_Fortran), ECase(TB_CPLUSPLUS)
#undef ECase
};
More information about the llvm-commits
mailing list