[BUG] memcpy minor bug

[FEAT] boot sequence
This commit is contained in:
2021-12-08 09:18:42 +01:00
parent 1a73164990
commit 66bbdea85f
2 changed files with 23 additions and 11 deletions

View File

@@ -133,7 +133,7 @@ int main(int argc,char*argv[]) {
romcpy();
reinit();
debug("ASCII SYSTEM BOOTING...");
lua_init(lua_filename);
lua_init(NULL);
lua_call_init();
while(!exit) {
@@ -472,8 +472,8 @@ void poke(uint16_t addr, uint8_t val) {
}
void memcpy(uint16_t dst, uint16_t src, uint16_t size) {
if (dst <= src) return;
if (src+size>=dst) return;
if ((dst<=src) && (dst+size>=src)) return;
if ((dst>=src) && (src+size>=dst)) return;
SDL_memcpy(&mem[dst], &mem[src], size);
}
@@ -496,7 +496,7 @@ void setmode(const uint8_t mode) {
}
void load(const char* str) {
SDL_strlcpy(lua_filename, str, SDL_strlen(str)+1);
if (str!=NULL) SDL_strlcpy(lua_filename, str, SDL_strlen(str)+1);
should_reset = true;
}