April 2012 - SerialICE - mail.coreboot.org

Patch set updated for serialice: e2efdc6 Fix build with lua5.2
by Patrick Georgi April 4, 2012

April 4, 2012

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/841 -gerrit commit e2efdc6562932d77007d4f0d7aaee2afcee8fbd3 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Mon Apr 2 14:39:14 2012 +0200 Fix build with lua5.2 Lua5.2 changed parts of its API. - deprecated luaL_register Use luaL_setfuncs instead (but not on 5.1, which doesn't have it) - hides the implementation detail of globals. Use the public API instead. Coccinelle script that was used for this part of the change: @@ expression L; expression T; @@ -lua_setfield(L, LUA_GLOBALSINDEX, T); +lua_setglobal(L, T); @@ expression L; expression T; @@ -lua_getfield(L, LUA_GLOBALSINDEX, T); +lua_getglobal(L, T); Change-Id: I4aff9ac443500aee261e650ec4894c6f911f2968 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- qemu-0.11.0/serialice.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/qemu-0.11.0/serialice.c b/qemu-0.11.0/serialice.c index 47689b7..af890e2 100644 --- a/qemu-0.11.0/serialice.c +++ b/qemu-0.11.0/serialice.c @@ -214,7 +214,11 @@ static int serialice_lua_registers(void) lua_newuserdata(L, sizeof(void *)); luaL_newmetatable(L, "registermt"); +#if LUA_VERSION_NUM <= 501 luaL_register(L, NULL, registermt); +#elif LUA_VERSION_NUM >= 502 + luaL_setfuncs(L, registermt, 0); +#endif lua_setmetatable(L, -2); lua_setglobal(L, "regs"); @@ -235,7 +239,7 @@ static int serialice_lua_init(void) /* Set global variable SerialICE_mainboard */ lua_pushstring(L, serialice_mainboard); - lua_setfield(L, LUA_GLOBALSINDEX, "SerialICE_mainboard"); + lua_setglobal(L, "SerialICE_mainboard"); /* Enable Register Access */ serialice_lua_registers(); @@ -283,7 +287,7 @@ static int serialice_io_read_filter(uint32_t * data, uint16_t port, int size) { int ret, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_read_filter"); + lua_getglobal(L, "SerialICE_io_read_filter"); lua_pushinteger(L, port); // port lua_pushinteger(L, size); // datasize result = lua_pcall(L, 2, 2, 0); @@ -303,7 +307,7 @@ static int serialice_io_write_filter(uint32_t * data, uint16_t port, int size) { int ret, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_write_filter"); + lua_getglobal(L, "SerialICE_io_write_filter"); lua_pushinteger(L, port); // port lua_pushinteger(L, size); // datasize lua_pushinteger(L, *data); // data @@ -329,7 +333,7 @@ static int serialice_memory_read_filter(uint32_t addr, uint32_t * data, { int ret = 0, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_read_filter"); + lua_getglobal(L, "SerialICE_memory_read_filter"); lua_pushinteger(L, addr); // addr lua_pushinteger(L, size); // datasize result = lua_pcall(L, 2, 3, 0); @@ -359,7 +363,7 @@ static int serialice_memory_write_filter(uint32_t addr, int size, int ret = 0, result; int write_to_qemu, write_to_serialice; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_write_filter"); + lua_getglobal(L, "SerialICE_memory_write_filter"); lua_pushinteger(L, addr); // address lua_pushinteger(L, size); // datasize lua_pushinteger(L, *data); // data @@ -390,9 +394,9 @@ static int serialice_msr_filter(int flags, uint32_t addr, uint32_t * hi, int ret, result; if (flags & FILTER_WRITE) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_write_filter"); + lua_getglobal(L, "SerialICE_msr_write_filter"); } else { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_read_filter"); + lua_getglobal(L, "SerialICE_msr_read_filter"); } lua_pushinteger(L, addr); // port @@ -420,7 +424,7 @@ static int serialice_cpuid_filter(uint32_t eax, uint32_t ecx, { int ret, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_cpuid_filter"); + lua_getglobal(L, "SerialICE_cpuid_filter"); lua_pushinteger(L, eax); // eax before calling lua_pushinteger(L, ecx); // ecx before calling @@ -464,13 +468,13 @@ static void serialice_log(int flags, uint32_t data, uint32_t addr, int size) int result; if ((flags & LOG_WRITE) && (flags & LOG_MEMORY)) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_write_log"); + lua_getglobal(L, "SerialICE_memory_write_log"); } else if (!(flags & LOG_WRITE) && (flags & LOG_MEMORY)) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_read_log"); + lua_getglobal(L, "SerialICE_memory_read_log"); } else if ((flags & LOG_WRITE) && !(flags & LOG_MEMORY)) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_write_log"); + lua_getglobal(L, "SerialICE_io_write_log"); } else { // if (!(flags & LOG_WRITE) && !(flags & LOG_MEMORY)) - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_read_log"); + lua_getglobal(L, "SerialICE_io_read_log"); } lua_pushinteger(L, addr); // addr/port @@ -493,9 +497,9 @@ static void serialice_msr_log(int flags, uint32_t addr, uint32_t hi, int result; if (flags & LOG_WRITE) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_write_log"); + lua_getglobal(L, "SerialICE_msr_write_log"); } else { // if (!(flags & LOG_WRITE)) - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_read_log"); + lua_getglobal(L, "SerialICE_msr_read_log"); } lua_pushinteger(L, addr); // addr/port @@ -515,7 +519,7 @@ static void serialice_cpuid_log(uint32_t eax, uint32_t ecx, cpuid_regs_t res, { int result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_cpuid_log"); + lua_getglobal(L, "SerialICE_cpuid_log"); lua_pushinteger(L, eax); // input: eax lua_pushinteger(L, ecx); // input: ecx

1 0

Patch set updated for serialice: e1ceb42 Fix build with lua5.2
by Patrick Georgi April 4, 2012

April 4, 2012

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/841 -gerrit commit e1ceb42ceef1191ab51269b28bef72f87e73eef8 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Mon Apr 2 14:39:14 2012 +0200 Fix build with lua5.2 Lua5.2 changed parts of its API. - deprecated luaL_register Use luaL_setfuncs instead (but not on 5.1, which doesn't have it) - hides the implementation detail of globals. Use the public API instead. Coccinelle script that was used for this part of the change: @@ expression L; expression T; @@ -lua_setfield(L, LUA_GLOBALSINDEX, T); +lua_setglobal(L, T); @@ expression L; expression T; @@ -lua_getfield(L, LUA_GLOBALSINDEX, T); +lua_getglobal(L, T); Change-Id: I4aff9ac443500aee261e650ec4894c6f911f2968 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- qemu-0.11.0/serialice.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/qemu-0.11.0/serialice.c b/qemu-0.11.0/serialice.c index 47689b7..1569498 100644 --- a/qemu-0.11.0/serialice.c +++ b/qemu-0.11.0/serialice.c @@ -214,7 +214,11 @@ static int serialice_lua_registers(void) lua_newuserdata(L, sizeof(void *)); luaL_newmetatable(L, "registermt"); +#if LUA_VERSION_NUM == 501 luaL_register(L, NULL, registermt); +#elif LUA_VERSION_NUM == 502 + luaL_setfuncs(L, registermt, 0); +#endif lua_setmetatable(L, -2); lua_setglobal(L, "regs"); @@ -235,7 +239,7 @@ static int serialice_lua_init(void) /* Set global variable SerialICE_mainboard */ lua_pushstring(L, serialice_mainboard); - lua_setfield(L, LUA_GLOBALSINDEX, "SerialICE_mainboard"); + lua_setglobal(L, "SerialICE_mainboard"); /* Enable Register Access */ serialice_lua_registers(); @@ -283,7 +287,7 @@ static int serialice_io_read_filter(uint32_t * data, uint16_t port, int size) { int ret, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_read_filter"); + lua_getglobal(L, "SerialICE_io_read_filter"); lua_pushinteger(L, port); // port lua_pushinteger(L, size); // datasize result = lua_pcall(L, 2, 2, 0); @@ -303,7 +307,7 @@ static int serialice_io_write_filter(uint32_t * data, uint16_t port, int size) { int ret, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_write_filter"); + lua_getglobal(L, "SerialICE_io_write_filter"); lua_pushinteger(L, port); // port lua_pushinteger(L, size); // datasize lua_pushinteger(L, *data); // data @@ -329,7 +333,7 @@ static int serialice_memory_read_filter(uint32_t addr, uint32_t * data, { int ret = 0, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_read_filter"); + lua_getglobal(L, "SerialICE_memory_read_filter"); lua_pushinteger(L, addr); // addr lua_pushinteger(L, size); // datasize result = lua_pcall(L, 2, 3, 0); @@ -359,7 +363,7 @@ static int serialice_memory_write_filter(uint32_t addr, int size, int ret = 0, result; int write_to_qemu, write_to_serialice; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_write_filter"); + lua_getglobal(L, "SerialICE_memory_write_filter"); lua_pushinteger(L, addr); // address lua_pushinteger(L, size); // datasize lua_pushinteger(L, *data); // data @@ -390,9 +394,9 @@ static int serialice_msr_filter(int flags, uint32_t addr, uint32_t * hi, int ret, result; if (flags & FILTER_WRITE) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_write_filter"); + lua_getglobal(L, "SerialICE_msr_write_filter"); } else { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_read_filter"); + lua_getglobal(L, "SerialICE_msr_read_filter"); } lua_pushinteger(L, addr); // port @@ -420,7 +424,7 @@ static int serialice_cpuid_filter(uint32_t eax, uint32_t ecx, { int ret, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_cpuid_filter"); + lua_getglobal(L, "SerialICE_cpuid_filter"); lua_pushinteger(L, eax); // eax before calling lua_pushinteger(L, ecx); // ecx before calling @@ -464,13 +468,13 @@ static void serialice_log(int flags, uint32_t data, uint32_t addr, int size) int result; if ((flags & LOG_WRITE) && (flags & LOG_MEMORY)) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_write_log"); + lua_getglobal(L, "SerialICE_memory_write_log"); } else if (!(flags & LOG_WRITE) && (flags & LOG_MEMORY)) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_read_log"); + lua_getglobal(L, "SerialICE_memory_read_log"); } else if ((flags & LOG_WRITE) && !(flags & LOG_MEMORY)) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_write_log"); + lua_getglobal(L, "SerialICE_io_write_log"); } else { // if (!(flags & LOG_WRITE) && !(flags & LOG_MEMORY)) - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_read_log"); + lua_getglobal(L, "SerialICE_io_read_log"); } lua_pushinteger(L, addr); // addr/port @@ -493,9 +497,9 @@ static void serialice_msr_log(int flags, uint32_t addr, uint32_t hi, int result; if (flags & LOG_WRITE) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_write_log"); + lua_getglobal(L, "SerialICE_msr_write_log"); } else { // if (!(flags & LOG_WRITE)) - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_read_log"); + lua_getglobal(L, "SerialICE_msr_read_log"); } lua_pushinteger(L, addr); // addr/port @@ -515,7 +519,7 @@ static void serialice_cpuid_log(uint32_t eax, uint32_t ecx, cpuid_regs_t res, { int result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_cpuid_log"); + lua_getglobal(L, "SerialICE_cpuid_log"); lua_pushinteger(L, eax); // input: eax lua_pushinteger(L, ecx); // input: ecx

1 0

Re: [SerialICE] lua script shows WARNING: undefined load(/store) operation @<location>
by Idwer Vollering April 2, 2012

April 2, 2012

Op 26 maart 2012 01:52 heeft Idwer Vollering <vidwer(a)gmail.com> het volgende geschreven: > Memory initialization registers reside in the address range > 0xfecf0000:0xfecffff but serialice (from git code) shows lines like > this: > "WARNING: undefined load operation @fecf0000" and "WARNING: undefined > store operation @fecf0000" > > To filter these registers I have edited serialice.lua, then added the > following filter to SerialICE_memory_read_filter: > if (addr >= 0xfecf0000 and addr <= 0xfecffff) then > return false, true, 0 > > and SerialICE_memory_write_filter: > if (addr >= 0xfecf0000 and addr <= 0xfecffff) then > return false, true, data > > > So the above filters aren't applied. Help? > > Idwer Fixed the WARNINGs by removing the package manager's installation of lua, then reinstalling lua from source: see http://www.serialice.com/Installation.html

1 0

New patch to review for serialice: f4ed2bc Fix build with lua5.2
by Patrick Georgi April 2, 2012

April 2, 2012

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/841 -gerrit commit f4ed2bc30f5e98d70443cc9e5ad659ee91907365 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Mon Apr 2 14:39:14 2012 +0200 Fix build with lua5.2 Lua5.2 hides the implementation detail of globals. Use the public API instead. Coccinelle script that was used: @@ expression L; expression T; @@ -lua_setfield(L, LUA_GLOBALSINDEX, T); +lua_setglobal(L, T); @@ expression L; expression T; @@ -lua_getfield(L, LUA_GLOBALSINDEX, T); +lua_getglobal(L, T); Change-Id: I4aff9ac443500aee261e650ec4894c6f911f2968 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- qemu-0.11.0/serialice.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qemu-0.11.0/serialice.c b/qemu-0.11.0/serialice.c index 47689b7..edf07db 100644 --- a/qemu-0.11.0/serialice.c +++ b/qemu-0.11.0/serialice.c @@ -235,7 +235,7 @@ static int serialice_lua_init(void) /* Set global variable SerialICE_mainboard */ lua_pushstring(L, serialice_mainboard); - lua_setfield(L, LUA_GLOBALSINDEX, "SerialICE_mainboard"); + lua_setglobal(L, "SerialICE_mainboard"); /* Enable Register Access */ serialice_lua_registers(); @@ -283,7 +283,7 @@ static int serialice_io_read_filter(uint32_t * data, uint16_t port, int size) { int ret, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_read_filter"); + lua_getglobal(L, "SerialICE_io_read_filter"); lua_pushinteger(L, port); // port lua_pushinteger(L, size); // datasize result = lua_pcall(L, 2, 2, 0); @@ -303,7 +303,7 @@ static int serialice_io_write_filter(uint32_t * data, uint16_t port, int size) { int ret, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_write_filter"); + lua_getglobal(L, "SerialICE_io_write_filter"); lua_pushinteger(L, port); // port lua_pushinteger(L, size); // datasize lua_pushinteger(L, *data); // data @@ -329,7 +329,7 @@ static int serialice_memory_read_filter(uint32_t addr, uint32_t * data, { int ret = 0, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_read_filter"); + lua_getglobal(L, "SerialICE_memory_read_filter"); lua_pushinteger(L, addr); // addr lua_pushinteger(L, size); // datasize result = lua_pcall(L, 2, 3, 0); @@ -359,7 +359,7 @@ static int serialice_memory_write_filter(uint32_t addr, int size, int ret = 0, result; int write_to_qemu, write_to_serialice; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_write_filter"); + lua_getglobal(L, "SerialICE_memory_write_filter"); lua_pushinteger(L, addr); // address lua_pushinteger(L, size); // datasize lua_pushinteger(L, *data); // data @@ -390,9 +390,9 @@ static int serialice_msr_filter(int flags, uint32_t addr, uint32_t * hi, int ret, result; if (flags & FILTER_WRITE) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_write_filter"); + lua_getglobal(L, "SerialICE_msr_write_filter"); } else { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_read_filter"); + lua_getglobal(L, "SerialICE_msr_read_filter"); } lua_pushinteger(L, addr); // port @@ -420,7 +420,7 @@ static int serialice_cpuid_filter(uint32_t eax, uint32_t ecx, { int ret, result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_cpuid_filter"); + lua_getglobal(L, "SerialICE_cpuid_filter"); lua_pushinteger(L, eax); // eax before calling lua_pushinteger(L, ecx); // ecx before calling @@ -464,13 +464,13 @@ static void serialice_log(int flags, uint32_t data, uint32_t addr, int size) int result; if ((flags & LOG_WRITE) && (flags & LOG_MEMORY)) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_write_log"); + lua_getglobal(L, "SerialICE_memory_write_log"); } else if (!(flags & LOG_WRITE) && (flags & LOG_MEMORY)) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_memory_read_log"); + lua_getglobal(L, "SerialICE_memory_read_log"); } else if ((flags & LOG_WRITE) && !(flags & LOG_MEMORY)) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_write_log"); + lua_getglobal(L, "SerialICE_io_write_log"); } else { // if (!(flags & LOG_WRITE) && !(flags & LOG_MEMORY)) - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_io_read_log"); + lua_getglobal(L, "SerialICE_io_read_log"); } lua_pushinteger(L, addr); // addr/port @@ -493,9 +493,9 @@ static void serialice_msr_log(int flags, uint32_t addr, uint32_t hi, int result; if (flags & LOG_WRITE) { - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_write_log"); + lua_getglobal(L, "SerialICE_msr_write_log"); } else { // if (!(flags & LOG_WRITE)) - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_msr_read_log"); + lua_getglobal(L, "SerialICE_msr_read_log"); } lua_pushinteger(L, addr); // addr/port @@ -515,7 +515,7 @@ static void serialice_cpuid_log(uint32_t eax, uint32_t ecx, cpuid_regs_t res, { int result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_cpuid_log"); + lua_getglobal(L, "SerialICE_cpuid_log"); lua_pushinteger(L, eax); // input: eax lua_pushinteger(L, ecx); // input: ecx

1 0