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

Merge pull request #602 from NieDzejkob/shiftstorm

Browse Source 
Report only one error when invalid shift has argument
This commit is contained in:
Eldred Habert
2020-10-13 15:48:16 +02:00
committed by GitHub
parent 4ce4fdec71 4e1d79081c
commit 42b3a17356
8 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm/macro.h
View File

@@ -29,7 +29,7 @@ uint32_t macro_GetUniqueID(void);
char const *macro_GetUniqueIDStr(void); char const *macro_GetUniqueIDStr(void);
void macro_SetUniqueID(uint32_t id); void macro_SetUniqueID(uint32_t id);
uint32_t macro_UseNewUniqueID(void); uint32_t macro_UseNewUniqueID(void);
void macro_ShiftCurrentArgs(void); void macro_ShiftCurrentArgs(int32_t count);
uint32_t macro_NbArgs(void); uint32_t macro_NbArgs(void);
#endif #endif

13
src/asm/macro.c
View File

@@ -128,12 +128,17 @@ uint32_t macro_UseNewUniqueID(void)
return maxUniqueID; return maxUniqueID;
} }
void macro_ShiftCurrentArgs(void) void macro_ShiftCurrentArgs(int32_t count)
{ {
if (!macroArgs) if (!macroArgs) {
error("Cannot shift macro arguments outside of a macro\n"); error("Cannot shift macro arguments outside of a macro\n");
else if (macroArgs->shift != macroArgs->nbArgs) } else if (count < 0) {
macroArgs->shift++; error("Cannot shift arguments by negative amount %" PRId32 "\n", count);
} else if (macroArgs->shift < macroArgs->nbArgs) {
macroArgs->shift += count;
if (macroArgs->shift > macroArgs->nbArgs)
macroArgs->shift = macroArgs->nbArgs;
}
} }
uint32_t macro_NbArgs(void) uint32_t macro_NbArgs(void)

9
src/asm/parser.y
View File

@@ -579,13 +579,8 @@ assert : T_POP_ASSERT assert_type relocexpr
} }
; ;
shift : T_POP_SHIFT { macro_ShiftCurrentArgs(); } shift : T_POP_SHIFT { macro_ShiftCurrentArgs(1); }
| T_POP_SHIFT uconst | T_POP_SHIFT const { macro_ShiftCurrentArgs($2); }
{
int32_t i = $2;
while (i--)
macro_ShiftCurrentArgs();
}
; ;
load : T_POP_LOAD string ',' sectiontype sectorg sectattrs { load : T_POP_LOAD string ',' sectiontype sectorg sectattrs {

4
test/asm/shift-negative.asm Normal file
View File

@@ -0,0 +1,4 @@
m: MACRO
shift -3
ENDM
m

3
test/asm/shift-negative.err Normal file
View File

@@ -0,0 +1,3 @@
ERROR: shift-negative.asm(4) -> shift-negative.asm::m(2):
Cannot shift arguments by negative amount -3
error: Assembly aborted (1 errors)!

0
test/asm/shift-negative.out Normal file
View File

1
test/asm/shift-outside-macro.asm
View File

@@ -1 +1,2 @@
shift shift
shift 3

4
test/asm/shift-outside-macro.err
View File

@@ -1,3 +1,5 @@
ERROR: shift-outside-macro.asm(1): ERROR: shift-outside-macro.asm(1):
Cannot shift macro arguments outside of a macro Cannot shift macro arguments outside of a macro
error: Assembly aborted (1 errors)! ERROR: shift-outside-macro.asm(2):
Cannot shift macro arguments outside of a macro
error: Assembly aborted (2 errors)!