diff --git a/CMakeLists.txt b/CMakeLists.txt index df1762b..8be35fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,7 @@ set(L7801_HEADERS ${L65_HEADERS} ) -set(L7801_FILES ${L65_SOURCE_DIR}/scv.l7801) +set(L7801_FILES ${L65_SOURCE_DIR}/scv.l65) set(L7801_SCRIPTS ${L65_SOURCE_DIR}/asm.lua diff --git a/l7801.c b/l7801.c index a403714..18c6442 100644 --- a/l7801.c +++ b/l7801.c @@ -140,12 +140,12 @@ static int luaopen_l7801(lua_State *L) } #define SRC_LUA(name) { #name, 0, script_ ## name ## _lua, sizeof(script_ ## name ## _lua) } -#define SRC_L7801(name) { #name, 1, script_ ## name ## _l7801, sizeof(script_ ## name ## _l7801) } +#define SRC_L65(name) { #name, 1, script_ ## name ## _l65, sizeof(script_ ## name ## _l65) } static struct script { const char *name; int t; const char *data; size_t sz; } embedded[] = { SRC_LUA(dkjson), SRC_LUA(l65cfg), SRC_LUA(re), - SRC_L7801(scv), + SRC_L65(scv), }; #undef SRC_LUA #undef SRC_L7801 diff --git a/scv.l7801 b/scv.l65 similarity index 100% rename from scv.l7801 rename to scv.l65 diff --git a/uPD7801.lua b/uPD7801.lua index e02c77d..7f85bfd 100644 --- a/uPD7801.lua +++ b/uPD7801.lua @@ -245,7 +245,7 @@ M.jr = function(label) if x < -32 or x > 0x32 then error("branch target out of range for " .. l .. ": " .. x) elseif x >= 0 then x = 0xc0 + x - return + return x else return x & 0xff end