Set __FILE__ in asm_processor (#793)

* Set __FILE__ in asm_processor

* bss fix

* Update to upstream version

Co-authored-by: zelda2774 <zelda2774@invalid>
This commit is contained in:
zelda2774
2021-04-25 20:37:32 +02:00
committed by GitHub
parent e11e8b709d
commit 4e81e4a388
3 changed files with 10 additions and 5 deletions
-1
View File
@@ -2254,7 +2254,6 @@ void CollisionCheck_AC_CylVsQuad(GlobalContext* globalCtx, CollisionCheckContext
static s8 sBssDummy0;
static s8 sBssDummy1;
static s8 sBssDummy2;
/**
* AC overlap check. Calculates the center of each collider element and the point of contact.
+1 -2
View File
@@ -3012,11 +3012,10 @@ s16 D_80125B5C[] = { 91, 91 }; // unused
// Due to an unknown reason, bss ordering changes within the 5 static variables in the function below.
// In order to restore the correct order, we need a specific number of bss variables in the file before that point.
// For this, we introduce 3 dummy variables which end up in padding at the end of the file's bss, so they don't actually
// For this, we introduce 2 dummy variables which end up in padding at the end of the file's bss, so they don't actually
// take space.
s8 sBssDummy1;
s8 sBssDummy2;
s8 sBssDummy3;
#ifdef NON_MATCHING
// mostly regalloc, minor ordering and stack usage differences