hirom optimize mirrors fix (closes #376)

trillllian · trillllian · commit f7b4eac3cc0e · 2025-10-31T20:59:43.000+02:00
diff --git a/src/asar/main.cpp b/src/asar/main.cpp
@@ -377,6 +377,8 @@ int getlenforlabel(int labelpos, int label_fs_id, bool exists)
 			else cur_effective_bank = relaxed_bank = target_bank;
 		}
 	}
+	// hirom has non-mirrored sram in 6000-7fff, so optimize mirrors shouldn't cover it
+	int mirror_bound = (mapper == hirom || mapper == exhirom) ? 0x6000 : 0x8000;
 
 	if(lbl_is_freespace) {
 		bank = freespaces[label_fs_id].bank;
@@ -410,7 +412,7 @@ int getlenforlabel(int labelpos, int label_fs_id, bool exists)
 		// we're in a bank with ram mirrors...
 		&& !(relaxed_bank & 0x40)
 		// and the label is in a mirrored section
-		&& !(bank & 0x40) && word < 0x8000 && !lbl_is_freespace)
+		&& !(bank & 0x40) && word < mirror_bound && !lbl_is_freespace)
 	{
 		return 2;
 	}
diff --git a/tests/hirom_mirrors.asm b/tests/hirom_mirrors.asm
@@ -0,0 +1,11 @@
+l = $006000
+l2 = $016000
+
+hirom
+org $008000
+optimize address mirrors
+;`08000
+;`ad 00 60
+lda l
+;`af 00 60 01
+lda l2

Original file line number	Diff line number	Diff line change
`@@ -377,6 +377,8 @@ int getlenforlabel(int labelpos, int label_fs_id, bool exists)`
`377`	`377`	`else cur_effective_bank = relaxed_bank = target_bank;`
`378`	`378`	`}`
`379`	`379`	`}`
	`380`	`+ // hirom has non-mirrored sram in 6000-7fff, so optimize mirrors shouldn't cover it`
	`381`	`+ int mirror_bound = (mapper == hirom \|\| mapper == exhirom) ? 0x6000 : 0x8000;`
`380`	`382`
`381`	`383`	`if(lbl_is_freespace) {`
`382`	`384`	`bank = freespaces[label_fs_id].bank;`
`@@ -410,7 +412,7 @@ int getlenforlabel(int labelpos, int label_fs_id, bool exists)`
`410`	`412`	`// we're in a bank with ram mirrors...`
`411`	`413`	`&& !(relaxed_bank & 0x40)`
`412`	`414`	`// and the label is in a mirrored section`
`413`		`- && !(bank & 0x40) && word < 0x8000 && !lbl_is_freespace)`
	`415`	`+ && !(bank & 0x40) && word < mirror_bound && !lbl_is_freespace)`
`414`	`416`	`{`
`415`	`417`	`return 2;`
`416`	`418`	`}`