Disallow file directives within area/region/func.

Kingcom · Jul 31, 2020 · ab030fb · ab030fb
1 parent ce12558
commit ab030fb
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 5 deletions.
diff --git a/Commands/CAssemblerCommand.h b/Commands/CAssemblerCommand.h
@@ -5,7 +5,8 @@ class SymbolData;
 
 struct ValidateState
 {
-	bool allowFileChange = true;
+	bool noFileChange = false;
+	const wchar_t *noFileChangeDirective = nullptr;
 };
 
 class CAssemblerCommand

diff --git a/Commands/CAssemblerLabel.cpp b/Commands/CAssemblerLabel.cpp
@@ -127,8 +127,11 @@ bool CDirectiveFunction::Validate(const ValidateState &state)
 	label->applyFileInfo();
 	bool result = label->Validate(state);
 
+	ValidateState contentValidation = state;
+	contentValidation.noFileChange = true;
+	contentValidation.noFileChangeDirective = L"function";
 	content->applyFileInfo();
-	if (content->Validate(state))
+	if (content->Validate(contentValidation))
 		result = true;
 
 	end = g_fileManager->getVirtualAddress();

diff --git a/Commands/CDirectiveArea.cpp b/Commands/CDirectiveArea.cpp
@@ -75,8 +75,11 @@ bool CDirectiveArea::Validate(const ValidateState &state)
 	bool result = false;
 	if (content)
 	{
+		ValidateState contentValidation = state;
+		contentValidation.noFileChange = true;
+		contentValidation.noFileChangeDirective = L"area";
 		content->applyFileInfo();
-		result = content->Validate(state);
+		result = content->Validate(contentValidation);
 	}
 	contentSize = g_fileManager->getVirtualAddress()-position;
 
@@ -203,13 +206,17 @@ bool CDirectiveAutoRegion::Validate(const ValidateState &state)
 {
 	resetPosition = g_fileManager->getVirtualAddress();
 
+	ValidateState contentValidation = state;
+	contentValidation.noFileChange = true;
+	contentValidation.noFileChangeDirective = L"region";
+
 	// We need at least one full pass run before we can get an address.
 	if (Global.validationPasses < 1)
 	{
 		// Just calculate contentSize.
 		position = g_fileManager->getVirtualAddress();
 		content->applyFileInfo();
-		content->Validate(state);
+		content->Validate(contentValidation);
 		contentSize = g_fileManager->getVirtualAddress() - position;
 
 		g_fileManager->seekVirtual(resetPosition);
@@ -249,7 +256,7 @@ bool CDirectiveAutoRegion::Validate(const ValidateState &state)
 	g_fileManager->seekVirtual(position);
 
 	content->applyFileInfo();
-	bool result = content->Validate(state);
+	bool result = content->Validate(contentValidation);
 	contentSize = g_fileManager->getVirtualAddress() - position;
 
 	// restore info of this command

diff --git a/Commands/CDirectiveFile.cpp b/Commands/CDirectiveFile.cpp
@@ -62,6 +62,15 @@ void CDirectiveFile::initClose()
 
 bool CDirectiveFile::Validate(const ValidateState &state)
 {
+	if (state.noFileChange)
+	{
+		if (type == Type::Close)
+			Logger::queueError(Logger::Error, L"Cannot close file within %S", state.noFileChangeDirective);
+		else
+			Logger::queueError(Logger::Error, L"Cannot open new file within %S", state.noFileChangeDirective);
+		return false;
+	}
+
 	virtualAddress = g_fileManager->getVirtualAddress();
 	Arch->NextSection();
 

diff --git a/Tests/Area/CloseFile/CloseFile.asm b/Tests/Area/CloseFile/CloseFile.asm
@@ -0,0 +1,17 @@
+.gba
+.create "out.bin",0
+
+.area 0x8
+.fill 0x8
+.close
+.endarea
+
+.macro myopen,offset
+	.open "out2.bin",offset
+.endmacro
+
+.area 0x8
+myopen 4
+.endarea
+
+.close
diff --git a/Tests/Area/CloseFile/expected.txt b/Tests/Area/CloseFile/expected.txt
@@ -0,0 +1,2 @@
+CloseFile.asm(6) error: Cannot close file within area
+CloseFile.asm(14) error: Cannot open new file within area