[TMS320C6x] Add block label symbols

Author: zznop

view/elf/elfview.cpp

@@ -1338,11 +1338,15 @@ bool ElfView::Init()
 				DefineElfSymbol(FunctionSymbol, entry->name, entry->value, false, entry->binding);
 				break;
 			case ELF_STT_FUNC:
-				if (!m_plat || m_plat->GetName() != "tms320c6x" || entry->name.find('$') == std::string::npos) {
-					// TMS320C6x ELFs contain function symbols for labeling blocks that aren't actually functions
-					DefineElfSymbol(FunctionSymbol, entry->name, entry->value, false, entry->binding);
+				{
+					auto symbolType = FunctionSymbol;
+					if (m_plat && m_plat->GetName() == "tms320c6x" && entry->name.find('$') != std::string::npos) {
+						// TMS320C6x ELFs use ELF_STT_FUNC symbols for labeling blocks
+						symbolType = LocalLabelSymbol;
+					}
+					DefineElfSymbol(symbolType, entry->name, entry->value, false, entry->binding);
+					break;
 				}
-				break;
 			case ELF_STT_TLS:
 				/* - only create Binja symbols for .symtab (not .dynsym) symbols
 				   - ignore mapping symbols, all is assumed data
@@ -2620,9 +2624,9 @@ void ElfView::DefineElfSymbol(BNSymbolType type, const string& incomingName, uin
 			}
 		}
 
-		if (!typeRef && m_arch && m_arch->GetName() == "hexagon")
+		if (!typeRef && m_arch && (m_arch->GetName() == "hexagon" || m_arch->GetName() == "tms320c6x"))
 		{
-			// Apply platform types for statically linked Hexagon binaries
+			// Apply platform types for statically linked Hexagon and TMS320C6x binaries
 			typeRef = GetDefaultPlatform()->GetFunctionByName(rawName);
 		}