fix freespace+base, change default optimize settings

RPGHacker · Jan 28, 2024 · 4f78750 · 4f78750
1 parent 3559b27
commit 4f78750
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 11 deletions.
diff --git a/src/asar/assembleblock.cpp b/src/asar/assembleblock.cpp
@@ -509,7 +509,9 @@ static void setlabel(string name, int loc=-1, bool is_static=false)
 	{
 		verifysnespos();
 		loc = snespos;
-		lbl_fs_id = freespaceid;
+		// if base is not active:
+		if(snespos == realsnespos) lbl_fs_id = freespaceid;
+		// if base is active, always treat the label as freespace 0, i.e. not freespace.
 	}
 
 	snes_label label_data;
@@ -622,7 +624,7 @@ static void freespaceend()
 {
 	if (freespaceid > 0)
 	{
-		freespaces[freespaceid].len = snespos-freespacestart;
+		freespaces[freespaceid].len = realsnespos-freespacestart;
 		snespos=(int)0xFFFFFFFF;
 		snespos_valid = false;
 	}
@@ -680,9 +682,9 @@ void initstuff()
 	incsrcdepth = 0;
 
 	optimizeforbank = -1;
-	optimize_dp = optimize_dp_flag::NONE;
+	optimize_dp = optimize_dp_flag::ALWAYS;
 	dp_base = 0;
-	optimize_address = optimize_address_flag::DEFAULT;
+	optimize_address = optimize_address_flag::MIRRORS;
 
 	in_struct = false;
 	in_sub_struct = false;

diff --git a/src/asar/main.cpp b/src/asar/main.cpp
@@ -28,9 +28,9 @@ int romlen_r;
 int pass;
 
 int optimizeforbank=-1;
-int optimize_dp = optimize_dp_flag::NONE;
+int optimize_dp = optimize_dp_flag::ALWAYS;
 int dp_base = 0;
-int optimize_address = optimize_address_flag::DEFAULT;
+int optimize_address = optimize_address_flag::MIRRORS;
 
 autoarray<callstack_entry> callstack;
 
@@ -376,11 +376,11 @@ static int getlenforlabel(snes_label thislabel, bool exists)
 	{
 		return 2;
 	}
-	else if((optimize_dp == optimize_dp_flag::RAM) && bank == 0x7E && (word-dp_base < 0x100))
+	else if((optimize_dp == optimize_dp_flag::RAM) && bank == 0x7E && (word-dp_base < 0x100) && !lblfreespace)
 	{
 		return 1;
 	}
-	else if(optimize_dp == optimize_dp_flag::ALWAYS && (bank == 0x7E || !(bank & 0x40)) && (word-dp_base < 0x100))
+	else if(optimize_dp == optimize_dp_flag::ALWAYS && (bank == 0x7E || !(bank & 0x40)) && (word-dp_base < 0x100) && !lblfreespace)
 	{
 		return 1;
 	}
@@ -1278,9 +1278,9 @@ void reseteverything()
 	writtenblocks.reset();
 
 	optimizeforbank=-1;
-	optimize_dp = optimize_dp_flag::NONE;
+	optimize_dp = optimize_dp_flag::ALWAYS;
 	dp_base = 0;
-	optimize_address = optimize_address_flag::DEFAULT;
+	optimize_address = optimize_address_flag::MIRRORS;
 
 	closecachedfiles();
 

diff --git a/tests/freespace_base.asm b/tests/freespace_base.asm
@@ -0,0 +1,11 @@
+;`+
+;`07fd7 0a
+;`80000 53 54 41 52 03 00 fc ff
+;`ad 03 10 EA
+;`fffff 00
+freecode cleaned
+base $1000
+lda lbl
+lbl:
+nop
+
diff --git a/tests/optimizer.asm b/tests/optimizer.asm
@@ -75,6 +75,8 @@ nonmirror = $008000
 nonmirror01 = $018000
 
 base off
+optimize address default
+optimize dp none
 ;test default asar optimization (bank only)
 lda test_00.test
 lda test_7E.test

diff --git a/tests/sa1freespace.asm b/tests/sa1freespace.asm
@@ -5,4 +5,4 @@
 ;`FFFFF 00
 sa1rom
 freecode cleaned
-NOP #4
+NOP #4
diff --git a/tests/structs.asm b/tests/structs.asm
@@ -27,6 +27,9 @@ endstruct
 struct test2 extends struct_without_org
 endstruct
 
+optimize address default
+optimize dp none
+
 lda test[1].size
 ;lda test.size
 lda test.test2.lol
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ @@
     ;`FFFFF 00
     sa1rom
     freecode cleaned
-    NOP #4
+    NOP #4