gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

-Wmacro-shift warns about shifting macro arguments too far (#741)

Browse Source 
Fixes #735
This commit is contained in:
Rangi
2021-02-16 13:31:01 -08:00
committed by GitHub
parent 122ba6eba5
commit cb61da8842
9 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/asm/macro.c
View File

@@ -168,12 +168,17 @@ void macro_ShiftCurrentArgs(int32_t count)
{
if (!macroArgs) {
error("Cannot shift macro arguments outside of a macro\n");
} else if (macroArgs->shift < macroArgs->nbArgs) {
} else if (count > 0 && (count > macroArgs->nbArgs
|| macroArgs->shift > macroArgs->nbArgs - count)) {
warning(WARNING_MACRO_SHIFT,
"Cannot shift macro arguments past their end\n");
macroArgs->shift = macroArgs->nbArgs;
} else if (count < 0 && macroArgs->shift < -count) {
warning(WARNING_MACRO_SHIFT,
"Cannot shift macro arguments past their beginning\n");
macroArgs->shift = 0;
} else {
macroArgs->shift += count;
if (macroArgs->shift > macroArgs->nbArgs)
macroArgs->shift = macroArgs->nbArgs;
else if (macroArgs->shift < 0)
macroArgs->shift = 0;
}
}