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

Merge pull request #444 from ISSOtm/fix_develop

Browse Source 
Fix errors in `make develop`
This commit is contained in:
Eldred Habert
2019-11-06 08:34:37 +01:00
committed by GitHub
parent 7063f66b2d f7c2665e14
commit 197f1e9b7b
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/asm/asmy.y
View File

@@ -116,7 +116,7 @@ size_t symvaluetostring(char *dest, size_t maxLength, char *sym,
strncpy(dest, write_ptr, maxLength + 1);
} else {
fullLength = snprintf(dest, maxLength + 1,
mode ? : "$%X",
mode ? mode : "$%X",
value);
}
@@ -137,7 +137,7 @@ static uint32_t str2int2(char *s, int32_t length)
int32_t i;
uint32_t r = 0;
i = ((length - 4) < 0) ? 0 : length - 4;
i = length < 4 ? 0 : length - 4;
while (i < length) {
r <<= 8;
r |= (uint8_t)s[i];

2
src/asm/symbol.c
View File

@@ -371,7 +371,7 @@ char *sym_FindMacroArg(int32_t i)
if (i == -1)
i = MAXMACROARGS + 1;
assert(i - 1 >= 0);
assert(i >= 1);
assert((size_t)(i - 1)
< sizeof(currentmacroargs) / sizeof(*currentmacroargs));