From 760e23cb0d92512bc2480d8c696301ffbde9e326 Mon Sep 17 00:00:00 2001
From: "Prof. 9" <prof9@outlook.com>
Date: Wed, 25 May 2022 19:14:51 +0200
Subject: [PATCH 1/6] Implement .importsym directive

---
 Commands/CDirectiveFile.cpp | 122 ++++++++++++++++++++++++++++++++++++
 Commands/CDirectiveFile.h   |  15 +++++
 Parser/DirectivesParser.cpp |  11 ++++
 Readme.md                   |   8 +++
 4 files changed, 156 insertions(+)

diff --git a/Commands/CDirectiveFile.cpp b/Commands/CDirectiveFile.cpp
index 7df4ac61..86a9f3ef 100644
--- a/Commands/CDirectiveFile.cpp
+++ b/Commands/CDirectiveFile.cpp
@@ -562,3 +562,125 @@ void DirectiveObjImport::writeSymData(SymbolData& symData) const
 
 	rel.writeSymbols(symData);
 }
+
+//
+// CDirectiveSymImport
+//
+CDirectiveSymImport::CDirectiveSymImport(const fs::path& fileName)
+{
+	// We may be adding global labels, so start a new section
+	updateSection(++Global.Section);
+
+	this->fileName = getFullPathName(fileName);
+	if (!fs::exists(this->fileName))
+	{
+		Logger::printError(Logger::FatalError,"File %s not found",this->fileName.u8string());
+		return;
+	}
+
+	fs::ifstream file(this->fileName,fs::ifstream::in|fs::ifstream::binary);
+	if (!file.is_open())
+	{
+		Logger::printError(Logger::FatalError,"Could not open file %s",this->fileName.u8string());
+		return;
+	}
+
+	std::string line;
+	size_t l = 0;
+	while (l++, std::getline(file,line,'\n'))
+	{
+		// End line at comment (starting with ;)
+		// \x1A included here as well since No$gba .sym file ends with it
+		size_t lineEnd = line.find_first_of(";\r\x1A");
+		if (lineEnd != std::string::npos && lineEnd > 0)
+		{
+			lineEnd = line.find_last_not_of(" \t",lineEnd-1);
+			if (lineEnd != std::string::npos)
+				lineEnd += 1;
+		}
+
+		// Skip empty line
+		if (lineEnd <= 0)
+			continue;
+		line = line.substr(0,lineEnd);
+
+		// Parse address of exactly 8 chars
+		const char* addressStart = line.c_str();
+		char* addressEnd;
+		uint32_t address = strtoul(addressStart,&addressEnd,16);
+		if (addressEnd != addressStart+8)
+		{
+			Logger::printError(Logger::Warning,"Invalid symbol address on line %i of symbols file %s",l,this->fileName);
+			continue;
+		}
+
+		// Skip one or more space or tabs
+		size_t startOfName = line.find_first_not_of(" \t",8);
+		if (startOfName == std::string::npos || startOfName < (8+1))
+		{
+			Logger::printError(Logger::Warning,"Invalid symbol address on line %i of symbols file %s",l,this->fileName);
+			continue;
+		}
+
+		// Rest of the line is the symbol name
+		std::string name = line.substr(startOfName);
+
+		// Create label for this symbol, if it's not a directive and it would be a global label
+		const Identifier identifier = Identifier(name);
+		if (name.find('.') != 0 && Global.symbolTable.isGlobalSymbol(identifier))
+		{
+			std::shared_ptr<Label> label = Global.symbolTable.getLabel(identifier,-1,-1);
+			if (label == nullptr)
+			{
+				// No$gba (supposedly...) allows pretty much any character, but armips doesn't
+				// We can't import this label, but if the user never references it, it's fine
+				// (If it IS referenced, that will eventually yield an error anyway)
+				Logger::printError(Logger::Warning, "Invalid label name \"%s\" on line %i of symbols file %s",name,l,this->fileName);
+				continue;
+			}
+			if (label->isDefined())
+			{
+				Logger::printError(Logger::Error, "Label \"%s\" already defined on line %i of symbols file %s",name,l,this->fileName);
+				continue;
+			}
+			// If already defined and not a global symbol, that's fine, we are in a dedicated section anyway
+			label->setOriginalName(identifier);
+			label->setValue(address);
+			label->setUpdateInfo(false);
+			label->setDefined(true);
+
+			// Store for later
+			labels.push_back(label);
+		}
+
+		// Store the symbol either way since we want to merge everything into the output symfile
+		symbols.push_back(std::pair(address, name));
+	}
+}
+
+bool CDirectiveSymImport::Validate(const ValidateState& state)
+{
+	return false;
+}
+
+void CDirectiveSymImport::Encode() const
+{
+
+}
+
+void CDirectiveSymImport::writeTempData(TempData& tempData) const
+{
+	tempData.writeLine(-1,tfm::format(".importsym \"%s\"",fileName.u8string()));
+	for (const auto& label: labels)
+	{
+		tempData.writeLine(label->getValue(),tfm::format("%s",label->getName()));
+	}
+}
+
+void CDirectiveSymImport::writeSymData(SymbolData& symData) const
+{
+	for (const auto& symbol: symbols)
+	{
+		symData.addLabel(symbol.first,symbol.second);
+	}
+}
diff --git a/Commands/CDirectiveFile.h b/Commands/CDirectiveFile.h
index a69d1bc6..c3d4b6a6 100644
--- a/Commands/CDirectiveFile.h
+++ b/Commands/CDirectiveFile.h
@@ -134,3 +134,18 @@ class DirectiveObjImport: public CAssemblerCommand
 	ElfRelocator rel;
 	std::unique_ptr<CAssemblerCommand> ctor;
 };
+
+class CDirectiveSymImport : public CAssemblerCommand
+{
+public:
+	CDirectiveSymImport(const fs::path& fileName);
+	~CDirectiveSymImport() { };
+	bool Validate(const ValidateState& state) override;
+	void Encode() const override;
+	void writeTempData(TempData& tempData) const override;
+	void writeSymData(SymbolData& symData) const override;
+private:
+	fs::path fileName;
+	std::vector<std::pair<uint64_t, std::string>> symbols;
+	std::vector<std::shared_ptr<Label>> labels;
+};
diff --git a/Parser/DirectivesParser.cpp b/Parser/DirectivesParser.cpp
index f984abd8..f5119968 100644
--- a/Parser/DirectivesParser.cpp
+++ b/Parser/DirectivesParser.cpp
@@ -190,6 +190,16 @@ std::unique_ptr<CAssemblerCommand> parseDirectiveObjImport(Parser& parser, int f
 	return std::make_unique<DirectiveObjImport>(fileName.path());
 }
 
+std::unique_ptr<CAssemblerCommand> parseDirectiveSymImport(Parser& parser, int flags)
+{
+	Expression exp = parser.parseExpression();
+	StringLiteral fileName;
+	if (!exp.evaluateString(fileName,true))
+		return nullptr;
+
+	return std::make_unique<CDirectiveSymImport>(fileName.path());
+}
+
 std::unique_ptr<CAssemblerCommand> parseDirectiveConditional(Parser& parser, int flags)
 {
 	ConditionType type;
@@ -792,6 +802,7 @@ const DirectiveMap directives = {
 
 	{ ".importobj",       { &parseDirectiveObjImport,       0 } },
 	{ ".importlib",       { &parseDirectiveObjImport,       0 } },
+	{ ".importsym",       { &parseDirectiveSymImport,       0 } },
 
 	{ ".erroronwarning",  { &parseDirectiveErrorWarning,    0 } },
 	{ ".relativeinclude", { &parseDirectiveRelativeInclude, 0 } },
diff --git a/Readme.md b/Readme.md
index e0616f72..9a920e55 100644
--- a/Readme.md
+++ b/Readme.md
@@ -816,6 +816,14 @@ By specifying `.nocash on`, No$gba semantics will be enabled for data directives
 
 By specifying `.sym off`, any symbols (e.g. labels) defined after it will not be written to the symfile (if specified with the `-sym`/`-sym2` command line flag). This can be useful when using labels to define enum values that should not be interpreted as memory addresses. Writing to the symfile can be enabled again with `.sym on`. By default, this feature is on.
 
+### Import symfile
+
+```
+.importsym SymFile
+```
+
+Imports all symbols from the existing symfile specified by `SymFile`. For any symbols in `SymFile` not starting with `.`, `@` or `@@`, a global label will be created, which can be used like any other label. Regardless of prefix, all symbols and directives in `SymFile` are also written to the main output symfile for this run of armips, if symfile writing is enabled. This directive terminates the scope for local labels and `equ`s.
+
 ## 5.2 MIPS directives
 
 ### Load delay

From 305008f98c21efbd82d70d930f033ff9fb7d4779 Mon Sep 17 00:00:00 2001
From: "Prof. 9" <prof9@outlook.com>
Date: Wed, 25 May 2022 19:16:08 +0200
Subject: [PATCH 2/6] Tests: Add possibility to verify symbols file

---
 Main/Tests.cpp   | 22 ++++++++++++++++++++++
 Tests/.gitignore |  1 +
 2 files changed, 23 insertions(+)

diff --git a/Main/Tests.cpp b/Main/Tests.cpp
index f29c5b75..6a660d2a 100644
--- a/Main/Tests.cpp
+++ b/Main/Tests.cpp
@@ -169,6 +169,28 @@ bool TestRunner::executeTest(const fs::path& dir, const std::string& testName, s
 		}
 	}
 
+	if (fs::exists("expected.sym"))
+	{
+		TextFile expectedFile;
+		TextFile actualFile;
+		expectedFile.open("expected.sym",TextFile::Read);
+		actualFile.open("output.sym",TextFile::Read);
+		if (actualFile.isOpen())
+		{
+			std::vector<std::string> expected = expectedFile.readAll();
+			std::vector<std::string> actual = actualFile.readAll();
+
+			if (expected != actual)
+			{
+				errorString += tfm::format("Symbols file does not match\n");
+				result = false;
+			}
+		} else {
+			errorString += tfm::format("Symbols file not produced\n");
+			result = false;
+		}
+	}
+
 	fs::current_path(oldDir);
 	return result;
 }
diff --git a/Tests/.gitignore b/Tests/.gitignore
index 2b47c09e..a88164a5 100644
--- a/Tests/.gitignore
+++ b/Tests/.gitignore
@@ -1,3 +1,4 @@
 output.bin
+output.sym
 output.txt
 *.temp.txt

From f67c48a52e4af0dc1aa03ce99d222ad9d87b2621 Mon Sep 17 00:00:00 2001
From: "Prof. 9" <prof9@outlook.com>
Date: Wed, 25 May 2022 19:16:53 +0200
Subject: [PATCH 3/6] Tests: remove output* files before a test is run (so we
 don't check stale files from a previous run if this one fails)

---
 Main/Tests.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Main/Tests.cpp b/Main/Tests.cpp
index 6a660d2a..fb1f203c 100644
--- a/Main/Tests.cpp
+++ b/Main/Tests.cpp
@@ -75,6 +75,17 @@ bool TestRunner::executeTest(const fs::path& dir, const std::string& testName, s
 	fs::path oldDir = fs::current_path();
 	fs::current_path(dir);
 
+	// Remove previous output files
+	for (const auto& file : fs::directory_iterator(fs::current_path()))
+	{
+		std::string fileName = file.path().filename().u8string();
+		if (fileName.rfind("output",0) == 0)
+		{
+			// If filename starts with output, delete the file
+			fs::remove(file.path());
+		}
+	}
+
 	ArmipsArguments settings;
 	std::vector<std::string> errors;
 	int expectedRetVal = 0;

From 72d306c0ba1de6e9cbe5f006bc6a9c3e11bfc928 Mon Sep 17 00:00:00 2001
From: "Prof. 9" <prof9@outlook.com>
Date: Wed, 25 May 2022 19:17:16 +0200
Subject: [PATCH 4/6] Add SymFileImport test

---
 Tests/Core/SymFileImport/SymFileImport.asm |  40 +++++++++++++++++++++
 Tests/Core/SymFileImport/commandLine.txt   |   1 +
 Tests/Core/SymFileImport/expected.bin      | Bin 0 -> 48 bytes
 Tests/Core/SymFileImport/expected.sym      |  23 ++++++++++++
 Tests/Core/SymFileImport/input.sym         |  15 ++++++++
 5 files changed, 79 insertions(+)
 create mode 100644 Tests/Core/SymFileImport/SymFileImport.asm
 create mode 100644 Tests/Core/SymFileImport/commandLine.txt
 create mode 100644 Tests/Core/SymFileImport/expected.bin
 create mode 100644 Tests/Core/SymFileImport/expected.sym
 create mode 100644 Tests/Core/SymFileImport/input.sym

diff --git a/Tests/Core/SymFileImport/SymFileImport.asm b/Tests/Core/SymFileImport/SymFileImport.asm
new file mode 100644
index 00000000..d01e9b96
--- /dev/null
+++ b/Tests/Core/SymFileImport/SymFileImport.asm
@@ -0,0 +1,40 @@
+.nds
+.create "output.bin",0
+
+.if defined(@@LocalLabel)
+	.error "@@LocalLabel should not be accessible here"
+.endif
+.if defined(@StaticLabel)
+	.error "@StaticLabel should not be accessible here"
+.endif
+
+.importsym "input.sym"
+
+.if defined(@@LocalLabel)
+	.error "@@LocalLabel should not be accessible here"
+.endif
+.if defined(@StaticLabel)
+	.error "@StaticLabel should not be accessible here"
+.endif
+
+.dd	ValidLabel
+.dd	ValidLabelWithSpaces
+.dd	ValidLabelWithTabs
+.dd	ValidLabelWithSpacesAndTabs
+.dd	ValidLabelWithComment
+
+ldr	r0,=0xABCDABCD
+.pool
+
+.org 0x12345678
+NewlyAddedLabel1:
+
+.definelabel NewlyAddedLabel2, 0x87654321
+
+.skip 4
+@NewlyAddedStaticLabel:
+
+.skip 4
+@@NewlyAddedLocalLabel:
+
+.close
diff --git a/Tests/Core/SymFileImport/commandLine.txt b/Tests/Core/SymFileImport/commandLine.txt
new file mode 100644
index 00000000..bd44b89d
--- /dev/null
+++ b/Tests/Core/SymFileImport/commandLine.txt
@@ -0,0 +1 @@
+0 -sym2 output.sym SymFileImport.asm
\ No newline at end of file
diff --git a/Tests/Core/SymFileImport/expected.bin b/Tests/Core/SymFileImport/expected.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f2fe73deaacd9648107486dd2cdd13e1fe0d2f97
GIT binary patch
literal 48
tcmWe&6kuck0wZN3We^?W8sZ9~%hJozLG+By8J!@Sg+c!5+0|!P0|1#33G)B|

literal 0
HcmV?d00001

diff --git a/Tests/Core/SymFileImport/expected.sym b/Tests/Core/SymFileImport/expected.sym
new file mode 100644
index 00000000..e7c21e23
--- /dev/null
+++ b/Tests/Core/SymFileImport/expected.sym
@@ -0,0 +1,23 @@
+00000000 0
+00000000 .dbl:0008
+00000008 .dbl:0008
+00000010 .dbl:0008
+00000018 .dbl:0008
+00000020 .dbl:0008
+0000002C .dbl:0004
+0000002C .pool
+01100110 ValidLabel
+11223344 @StaticLabel
+12345678 NewlyAddedLabel1
+1234567C @NewlyAddedStaticLabel
+12345680 @@NewlyAddedLocalLabel
+23322332 ValidLabelWithSpaces
+45544554 ValidLabelWithTabs
+55667788 @StaticLabel
+67766776 ValidLabelWithSpacesAndTabs
+87654321 NewlyAddedLabel2
+89988998 ValidLabelWithComment
+99AABBCC @@LocalLabel
+DDEEFF00 @@LocalLabel
+FEDCBA98 .pool
+
\ No newline at end of file
diff --git a/Tests/Core/SymFileImport/input.sym b/Tests/Core/SymFileImport/input.sym
new file mode 100644
index 00000000..f07e5df7
--- /dev/null
+++ b/Tests/Core/SymFileImport/input.sym
@@ -0,0 +1,15 @@
+; Line with comment
+
+01100110 ValidLabel
+23322332    ValidLabelWithSpaces
+45544554		ValidLabelWithTabs
+67766776  	  	ValidLabelWithSpacesAndTabs
+89988998 ValidLabelWithComment ; No$gba does allow this, if there is whitespace before the ;
+
+11223344 @StaticLabel
+55667788 @StaticLabel
+99AABBCC @@LocalLabel
+DDEEFF00 @@LocalLabel
+
+FEDCBA98 .pool
+
\ No newline at end of file

From 6fe5f4c07842b599ef79c2fbac6bc0d8d910a6c2 Mon Sep 17 00:00:00 2001
From: "Prof. 9" <prof9@outlook.com>
Date: Wed, 25 May 2022 19:35:47 +0200
Subject: [PATCH 5/6] Fix importsym with Unix-style newlines

---
 Commands/CDirectiveFile.cpp        | 7 +++----
 Tests/Core/SymFileImport/input.sym | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Commands/CDirectiveFile.cpp b/Commands/CDirectiveFile.cpp
index 86a9f3ef..efb5fbbf 100644
--- a/Commands/CDirectiveFile.cpp
+++ b/Commands/CDirectiveFile.cpp
@@ -591,12 +591,11 @@ CDirectiveSymImport::CDirectiveSymImport(const fs::path& fileName)
 	{
 		// End line at comment (starting with ;)
 		// \x1A included here as well since No$gba .sym file ends with it
-		size_t lineEnd = line.find_first_of(";\r\x1A");
+		size_t lineEnd = line.length();
+		lineEnd = std::min(line.find_first_of(";\r\x1A"),lineEnd);
 		if (lineEnd != std::string::npos && lineEnd > 0)
 		{
-			lineEnd = line.find_last_not_of(" \t",lineEnd-1);
-			if (lineEnd != std::string::npos)
-				lineEnd += 1;
+			lineEnd = std::max(line.find_last_not_of(" \t",lineEnd-1)+1,(size_t)0);
 		}
 
 		// Skip empty line
diff --git a/Tests/Core/SymFileImport/input.sym b/Tests/Core/SymFileImport/input.sym
index f07e5df7..9d1110f0 100644
--- a/Tests/Core/SymFileImport/input.sym
+++ b/Tests/Core/SymFileImport/input.sym
@@ -5,7 +5,7 @@
 45544554		ValidLabelWithTabs
 67766776  	  	ValidLabelWithSpacesAndTabs
 89988998 ValidLabelWithComment ; No$gba does allow this, if there is whitespace before the ;
-
+    
 11223344 @StaticLabel
 55667788 @StaticLabel
 99AABBCC @@LocalLabel

From 24b3a0b20b4e851753e562a709cee310383d9c3d Mon Sep 17 00:00:00 2001
From: "Prof. 9" <prof9@outlook.com>
Date: Fri, 27 May 2022 15:52:25 +0200
Subject: [PATCH 6/6] .importsym: Parse function sizes and trim optional
 arguments from identifier, cleanup

---
 Commands/CDirectiveFile.cpp                | 112 ++++++++++++++-------
 Commands/CDirectiveFile.h                  |   3 +-
 Core/ELF/ElfRelocator.cpp                  |   2 +-
 Core/SymbolTable.h                         |   6 +-
 Tests/Core/SymFileImport/SymFileImport.asm |   7 ++
 Tests/Core/SymFileImport/expected.bin      | Bin 48 -> 56 bytes
 Tests/Core/SymFileImport/expected.sym      |   6 +-
 Tests/Core/SymFileImport/input.sym         |   2 +
 8 files changed, 93 insertions(+), 45 deletions(-)

diff --git a/Commands/CDirectiveFile.cpp b/Commands/CDirectiveFile.cpp
index efb5fbbf..4ab6d41c 100644
--- a/Commands/CDirectiveFile.cpp
+++ b/Commands/CDirectiveFile.cpp
@@ -566,6 +566,24 @@ void DirectiveObjImport::writeSymData(SymbolData& symData) const
 //
 // CDirectiveSymImport
 //
+std::string trimSymFileLine(std::string line)
+{
+	// Trim start of line
+	size_t lineStart = line.find_first_not_of(" \t");
+
+	// End line at comment (starting with ;)
+	// \x1A included here as well since No$gba .sym file ends with it
+	size_t lineEnd = line.find_first_of(";\x1A");
+
+	if (lineStart >= lineEnd)
+		return std::string(); // line consists of only whitespace
+
+	// Trim end of line
+	lineEnd = line.find_last_not_of(" \t",lineEnd-1);
+	// lineEnd now points to position of last char
+	return line.substr(lineStart,lineEnd-lineStart+1);
+}
+
 CDirectiveSymImport::CDirectiveSymImport(const fs::path& fileName)
 {
 	// We may be adding global labels, so start a new section
@@ -578,52 +596,62 @@ CDirectiveSymImport::CDirectiveSymImport(const fs::path& fileName)
 		return;
 	}
 
-	fs::ifstream file(this->fileName,fs::ifstream::in|fs::ifstream::binary);
-	if (!file.is_open())
+	TextFile file;
+	file.open(this->fileName,TextFile::Read);
+	if (!file.isOpen())
 	{
 		Logger::printError(Logger::FatalError,"Could not open file %s",this->fileName.u8string());
 		return;
 	}
 
-	std::string line;
+	std::vector<std::string> lines = file.readAll();
 	size_t l = 0;
-	while (l++, std::getline(file,line,'\n'))
+	for (std::string line: lines)
 	{
-		// End line at comment (starting with ;)
-		// \x1A included here as well since No$gba .sym file ends with it
-		size_t lineEnd = line.length();
-		lineEnd = std::min(line.find_first_of(";\r\x1A"),lineEnd);
-		if (lineEnd != std::string::npos && lineEnd > 0)
-		{
-			lineEnd = std::max(line.find_last_not_of(" \t",lineEnd-1)+1,(size_t)0);
-		}
-
-		// Skip empty line
-		if (lineEnd <= 0)
+		l++;
+		line = trimSymFileLine(line);
+		if (line.empty())
 			continue;
-		line = line.substr(0,lineEnd);
 
-		// Parse address of exactly 8 chars
-		const char* addressStart = line.c_str();
-		char* addressEnd;
-		uint32_t address = strtoul(addressStart,&addressEnd,16);
-		if (addressEnd != addressStart+8)
+		// Parse symbol address
+		const char* addrStart = (char*)line.c_str();
+		char* addrEnd;
+		uint32_t symAddr = strtoul(addrStart,&addrEnd,16);
+		// Check: not 8 chars, not followed by space/tab
+		if (addrStart+8 != addrEnd || !strchr(" \t",*addrEnd))
 		{
 			Logger::printError(Logger::Warning,"Invalid symbol address on line %i of symbols file %s",l,this->fileName);
 			continue;
 		}
 
-		// Skip one or more space or tabs
-		size_t startOfName = line.find_first_not_of(" \t",8);
-		if (startOfName == std::string::npos || startOfName < (8+1))
+		// Rest of the line is the symbol value
+		std::string symVal = std::string(addrEnd);
+		symVal = symVal.substr(symVal.find_first_not_of(" \t"));
+
+		std::string name = symVal;
+
+		// Get optional label size
+		size_t commaPos = symVal.find(',');
+		uint32_t funcSize = 0;
+		if (commaPos != std::string::npos)
 		{
-			Logger::printError(Logger::Warning,"Invalid symbol address on line %i of symbols file %s",l,this->fileName);
-			continue;
+			// Parse size
+			const char* sizeStart = symVal.c_str()+commaPos+1;
+			char* sizeEnd;
+			funcSize = strtoul(sizeStart,&sizeEnd,16);
+			// Check: empty size, not in range, not followed by eol/space/tab/comma
+			if (sizeStart == sizeEnd || errno == ERANGE || !strchr("\0 \t,",*sizeEnd))
+			{
+				Logger::printError(Logger::Warning,"Invalid function size on line %i of symbols file %s",l,this->fileName);
+				funcSize = 0;
+				// We can still salvage this I guess
+			}
+			else {
+				// Got valid label size, so remove it from identifier (trim end in the process)
+				name = symVal.substr(0,symVal.find_first_of(" \t"));
+			}
 		}
 
-		// Rest of the line is the symbol name
-		std::string name = line.substr(startOfName);
-
 		// Create label for this symbol, if it's not a directive and it would be a global label
 		const Identifier identifier = Identifier(name);
 		if (name.find('.') != 0 && Global.symbolTable.isGlobalSymbol(identifier))
@@ -634,26 +662,26 @@ CDirectiveSymImport::CDirectiveSymImport(const fs::path& fileName)
 				// No$gba (supposedly...) allows pretty much any character, but armips doesn't
 				// We can't import this label, but if the user never references it, it's fine
 				// (If it IS referenced, that will eventually yield an error anyway)
-				Logger::printError(Logger::Warning, "Invalid label name \"%s\" on line %i of symbols file %s",name,l,this->fileName);
+				Logger::printError(Logger::Warning,"Invalid label name \"%s\" on line %i of symbols file %s",name,l,this->fileName);
 				continue;
 			}
 			if (label->isDefined())
 			{
-				Logger::printError(Logger::Error, "Label \"%s\" already defined on line %i of symbols file %s",name,l,this->fileName);
+				Logger::printError(Logger::Error,"Label \"%s\" already defined on line %i of symbols file %s",name,l,this->fileName);
 				continue;
 			}
 			// If already defined and not a global symbol, that's fine, we are in a dedicated section anyway
 			label->setOriginalName(identifier);
-			label->setValue(address);
+			label->setValue(symAddr);
+			label->setInfo(funcSize);
 			label->setUpdateInfo(false);
 			label->setDefined(true);
 
-			// Store for later
 			labels.push_back(label);
+		} else {
+			// Store the symbol anyway since we want to merge everything into the output symfile
+			otherSymbols.push_back(std::pair(symAddr,symVal));
 		}
-
-		// Store the symbol either way since we want to merge everything into the output symfile
-		symbols.push_back(std::pair(address, name));
 	}
 }
 
@@ -678,7 +706,17 @@ void CDirectiveSymImport::writeTempData(TempData& tempData) const
 
 void CDirectiveSymImport::writeSymData(SymbolData& symData) const
 {
-	for (const auto& symbol: symbols)
+	for (const auto& label: labels)
+	{
+		if (label->getInfo())
+			symData.startFunction(label->getValue());
+
+		symData.addLabel(label->getValue(),label->getName().string());
+
+		if (label->getInfo())
+			symData.endFunction(label->getValue()+label->getInfo());
+	}
+	for (const auto& symbol: otherSymbols)
 	{
 		symData.addLabel(symbol.first,symbol.second);
 	}
diff --git a/Commands/CDirectiveFile.h b/Commands/CDirectiveFile.h
index c3d4b6a6..3002d394 100644
--- a/Commands/CDirectiveFile.h
+++ b/Commands/CDirectiveFile.h
@@ -139,13 +139,12 @@ class CDirectiveSymImport : public CAssemblerCommand
 {
 public:
 	CDirectiveSymImport(const fs::path& fileName);
-	~CDirectiveSymImport() { };
 	bool Validate(const ValidateState& state) override;
 	void Encode() const override;
 	void writeTempData(TempData& tempData) const override;
 	void writeSymData(SymbolData& symData) const override;
 private:
 	fs::path fileName;
-	std::vector<std::pair<uint64_t, std::string>> symbols;
 	std::vector<std::shared_ptr<Label>> labels;
+	std::vector<std::pair<uint64_t, std::string>> otherSymbols;
 };
diff --git a/Core/ELF/ElfRelocator.cpp b/Core/ELF/ElfRelocator.cpp
index 16a2dc58..a7aef19d 100644
--- a/Core/ELF/ElfRelocator.cpp
+++ b/Core/ELF/ElfRelocator.cpp
@@ -384,7 +384,7 @@ bool ElfRelocator::relocateFile(ElfRelocatorFile& file, int64_t& relocationAddre
 					
 					relData.relocationBase = (unsigned int) label->getValue();
 					relData.targetSymbolType = label->isData() ? STT_OBJECT : STT_FUNC;
-					relData.targetSymbolInfo = label->getInfo();
+					relData.targetSymbolInfo = (int)label->getInfo();
 				} else {
 					relData.relocationBase = relocationOffsets[symSection]+relData.symbolAddress;
 				}
diff --git a/Core/SymbolTable.h b/Core/SymbolTable.h
index f640f519..3ff827a6 100644
--- a/Core/SymbolTable.h
+++ b/Core/SymbolTable.h
@@ -44,8 +44,8 @@ class Label
 	void setDefined(bool b) { defined = b; };
 	bool isData() { return data; };
 	void setIsData(bool b) { data = b; };
-	void setInfo(int inf) { info = inf; };
-	int getInfo() { return info; };
+	void setInfo(int64_t inf) { info = inf; };
+	int64_t getInfo() { return info; };
 	void setUpdateInfo(bool b) { updateInfo = b; };
 	bool getUpdateInfo() { return updateInfo; };
 	void setSection(int num) { section = num; }
@@ -59,7 +59,7 @@ class Label
 	bool defined = false;
 	bool data = false;
 	bool updateInfo = true;
-	int info = 0;
+	int64_t info = 0;
 	int section = 0;
 };
 
diff --git a/Tests/Core/SymFileImport/SymFileImport.asm b/Tests/Core/SymFileImport/SymFileImport.asm
index d01e9b96..2e378b8e 100644
--- a/Tests/Core/SymFileImport/SymFileImport.asm
+++ b/Tests/Core/SymFileImport/SymFileImport.asm
@@ -1,6 +1,9 @@
 .nds
 .create "output.bin",0
 
+.if defined(.pool)
+	.error ".pool should not be accessible here"
+.endif
 .if defined(@@LocalLabel)
 	.error "@@LocalLabel should not be accessible here"
 .endif
@@ -10,6 +13,9 @@
 
 .importsym "input.sym"
 
+.if defined(.pool)
+	.error ".pool should not be accessible here"
+.endif
 .if defined(@@LocalLabel)
 	.error "@@LocalLabel should not be accessible here"
 .endif
@@ -22,6 +28,7 @@
 .dd	ValidLabelWithTabs
 .dd	ValidLabelWithSpacesAndTabs
 .dd	ValidLabelWithComment
+.dd	Function
 
 ldr	r0,=0xABCDABCD
 .pool
diff --git a/Tests/Core/SymFileImport/expected.bin b/Tests/Core/SymFileImport/expected.bin
index f2fe73deaacd9648107486dd2cdd13e1fe0d2f97..8448564031898dc593724cd2d41264df4b20e423 100644
GIT binary patch
delta 21
acmXr8n4lqWro)8+1Xvj4pPpTPb~OMzG6ul_

delta 13
UcmcC8n4rPI!XW?j?CP_t0U7!QApigX

diff --git a/Tests/Core/SymFileImport/expected.sym b/Tests/Core/SymFileImport/expected.sym
index e7c21e23..270ccdc0 100644
--- a/Tests/Core/SymFileImport/expected.sym
+++ b/Tests/Core/SymFileImport/expected.sym
@@ -4,8 +4,10 @@
 00000010 .dbl:0008
 00000018 .dbl:0008
 00000020 .dbl:0008
-0000002C .dbl:0004
-0000002C .pool
+00000028 .dbl:0008
+00000034 .dbl:0004
+00000034 .pool
+004488CC Function,CC884400
 01100110 ValidLabel
 11223344 @StaticLabel
 12345678 NewlyAddedLabel1
diff --git a/Tests/Core/SymFileImport/input.sym b/Tests/Core/SymFileImport/input.sym
index 9d1110f0..e8a35f31 100644
--- a/Tests/Core/SymFileImport/input.sym
+++ b/Tests/Core/SymFileImport/input.sym
@@ -11,5 +11,7 @@
 99AABBCC @@LocalLabel
 DDEEFF00 @@LocalLabel
 
+  004488CC  Function  ,  CC884400  
+
 FEDCBA98 .pool
 
\ No newline at end of file