Changeset 864 for trunk

Timestamp:

12/23/09 02:10:17 (2 years ago)

Author:

reyalp

Message:

* Preliminary support for calling event procedures and arbitrary functions. See  http://chdk.wikia.com/wiki/LUA/LUA_Reference/Native_Function_Calls
* add support for byte and word access with peek and poke
* add lib/armutil/libarmutil.a for various arm code that doesn't belong elsewhere.
* move reverse_bytes_order lib/armutil

Location:

trunk

Files:

• CHDK/SCRIPTS/TEST/tstcallf.lua (added)
• buildconf.inc (modified) (1 diff)
• core/Makefile (modified) (2 diffs)
• core/luascript.c (modified) (3 diffs)
• include/lolevel.h (modified) (1 diff)
• include/platform.h (modified) (1 diff)
• lib/Makefile (modified) (1 diff)
• lib/armutil (added)
• lib/armutil/Makefile (added)
• lib/armutil/README.TXT (added)
• lib/armutil/callfunc.S (added)
• lib/armutil/callfunc_test.c (added)
• lib/armutil/reversebytes.S (added)
• platform/generic/wrappers.c (modified) (1 diff)

trunk/buildconf.inc

@@ -12 +12 @@
 OPT_EDGEOVERLAY=1
 OPT_LUA_STRLIB=1
+#allow Lua to call arbitrary ROM functions and eventprocs
+# WARNING: This is DANGEROUS. e.g. call_event_proc("EraseSectorOfRom",...)
+# NOTE: the interface for this may change in the future, to support better support buffers etc
+#OPT_LUA_CALL_NATIVE=1
 #OPT_MD_DEBUG=1
 # needs proper fi2.inc in platform/ !!! see http://chdk.setepontos.com/index.php/topic,2995.0.html

trunk/core/Makefile

@@ -53 +53 @@
 CFLAGS+=-DOPT_MD_DEBUG
 endif 
+ifdef OPT_LUA_CALL_NATIVE
+CFLAGS+=-DOPT_LUA_CALL_NATIVE
+endif 
+
 OBJS=entry.o nothumb.o main.o gui_draw.o gui_menu.o gui_palette.o gui_mbox.o \
      gui_fselect.o gui.o kbd.o conf.o \
@@ -76 +80 @@
           $(topdir)lib/font/libfont.a $(topdir)lib/math/libmath.a \
           $(topdir)lib/ubasic/libubasic.a $(topdir)lib/lang/liblang.a \
-          $(topdir)lib/lua/liblua.a
+          $(topdir)lib/lua/liblua.a \
+          $(topdir)lib/armutil/libarmutil.a
         @echo \-\> $@
         $(CC) $(CFLAGS) -o $@ --start-group $^  $(LDLIBS) --end-group $(LDFLAGS) $(LDOPTS)

trunk/core/luascript.c

@@ -725 +725 @@
 }
 
+/*
+  val=peek(address[,size])
+  return the value found at address in memory, or nil if address or size is invalid
+  size is optional 1=byte 2=halfword 4=word. defaults is 4
+*/
 static int luaCB_peek( lua_State* L )
 {
-  int addr = (luaL_checknumber(L,1));
-  // must be alligned
-  if (addr & 0x3) {
-        lua_pushnil(L);
+  unsigned addr = luaL_checknumber(L,1);
+  unsigned size = luaL_optnumber(L, 2, 4);
+  switch(size) {
+    case 1: 
+      lua_pushnumber( L, *(unsigned char *)(addr) );
+    break;
+    case 2:
+      if (addr & 0x1) {
+        lua_pushnil(L);
+      }
+      else {
+        lua_pushnumber( L, *(unsigned short *)(addr) );
+      }
+    break;
+    case 4:
+      if (addr & 0x3) {
+        lua_pushnil(L);
+      }
+      else {
+        lua_pushnumber( L, *(unsigned *)(addr) );
+      }
+    break;
+    default:
+      lua_pushnil(L);
+
+  }
+  return 1;
+}
+
+/*
+  status=poke(address,value[,size])
+  writes value to address in memory
+  size is optional 1=byte 2=halfword 4=word. defaults is 4
+  returns true, or nil if address or size is invalid
+*/
+static int luaCB_poke( lua_State* L )
+{
+  unsigned addr = luaL_checknumber(L,1);
+  unsigned val = luaL_checknumber(L,2);
+  unsigned size = luaL_optnumber(L, 3, 4);
+  int status = 0;
+  switch(size) {
+    case 1: 
+        *(unsigned char *)(addr) = (unsigned char)val;
+        lua_pushboolean(L,1);
+        status=1;
+    break;
+    case 2:
+      if (!(addr & 0x1)) {
+        *(unsigned short *)(addr) = (unsigned short)val;
+        status=1;
+      }
+    break;
+    case 4:
+      if (!(addr & 0x3)) {
+        *(unsigned *)(addr) = val;
+        status=1;
+      }
+    break;
+  }
+  if(status) {
+    lua_pushboolean(L,1);
   }
   else {
-    lua_pushnumber( L, *(unsigned *)(addr) );
-  }
-  return 1;
-}
-
-static int luaCB_poke( lua_State* L )
-{
-  int addr = (luaL_checknumber(L,1));
-  int val = (luaL_checknumber(L,2));
-  if (addr & 0x3) {
-        lua_pushnil(L);
-  }
-  else {
-    *(unsigned *)(addr) = val;
-    lua_pushboolean(L,1);
+    lua_pushnil(L);
   }
   return 1;
@@ -1106 +1155 @@
   return 0;
 }
+
+/*
+pack the lua args into a buffer to pass to the native code calling functions 
+currently only handles strings/numbers
+start is the stack index of the first arg
+*/
+#ifdef OPT_LUA_CALL_NATIVE
+static int pack_native_args( lua_State* L, unsigned start, unsigned *argbuf)
+{
+  unsigned i;
+  unsigned end = lua_gettop(L);
+
+  for(i = start; i <= end; i++,argbuf++) {
+    if (lua_type(L, i) == LUA_TSTRING) {
+        *argbuf=(unsigned)lua_tostring( L, i);
+    }
+    else if (lua_type(L, i) == LUA_TNUMBER) {
+        *argbuf=lua_tonumber( L, i);
+    }
+    else {
+      return 0;
+    }
+  }
+  return 1;
+}
+
+/*
+Native function call interface. Can be used to call canon eventprocs or arbitrary
+pointers.
+
+NOTE: this is preliminary, interface may change in later versions!
+All arguments must be strings or numbers.
+If the function expects to modify it's arguments via a pointer,
+then you must provide a number that is a valid pointer. 
+
+You can use the "AllocateMemory" eventproc to obtain buffers.
+
+If the function tries to write to a string passed from lua, Bad Things may happen.
+
+This is potentially dangerous, functions exist which can destroy the onboard firmware.
+*/
+
+/*
+result=call_func_ptr(ptr,...)
+ptr: address of a valid ARM or Thumb function, which uses the normal C calling convention.
+result: R0 value after the call returns
+NOTE:
+lua does not correctly handle hex constants which would represent a negative number.
+You must use the signed decimal value instead.
+*/
+static int luaCB_call_func_ptr( lua_State* L)
+{
+  unsigned *argbuf=NULL;
+  unsigned i;
+  unsigned n_args = lua_gettop(L)-1;
+  void *fptr;
+
+  fptr=(void *)luaL_checknumber( L, 1 );
+
+  if (n_args) {
+    argbuf=malloc(n_args * 4);
+    if(!argbuf) {
+      return luaL_error( L, "malloc fail" );
+    }
+    if(!pack_native_args(L, 2, argbuf)) {
+      free(argbuf);
+      return luaL_error( L, "expected string or number" );
+    }
+  }
+  
+  lua_pushnumber( L, call_func_ptr(fptr, argbuf, n_args) );
+  free(argbuf);
+  return 1;
+}
+
+/* 
+Call an event procedure
+
+result=call_event_proc("EventprocName",...)
+result is the value returned by ExecuteEventProcedure, which is -1 if the eventproc is not found, 
+or the eventproc return value (which could also be -1)
+NOTE:
+Many eventprocs are not registered by default, but can be loaded by calling another event proc
+Some useful ones are
+SystemEventInit
+        includes AllocateMemory, FreeMemory, sprintf, memcpy, Fut functions, log ...
+UI_RegistDebugEventProc
+        includes capture mode functions, PTM_ functions and much more 
+RegisterProductTestEvent
+        includes PT_ functions
+
+Others:
+RegisterShootSeqEvent
+RegisterNRTableEvent
+*/
+
+// grab from lowlevel
+extern unsigned _ExecuteEventProcedure(const char *name,...);
+static int luaCB_call_event_proc( lua_State* L )
+{
+  const char *evpname;
+  unsigned *argbuf;
+  unsigned i;
+  unsigned n_args = lua_gettop(L);
+
+  evpname=luaL_checkstring( L, 1 );
+
+  argbuf=malloc(n_args * 4);
+  if (!argbuf) {
+    return luaL_error( L, "malloc fail" );
+  }
+
+  // event proc name is first arg
+  *argbuf = (unsigned)evpname;
+  
+  if(!pack_native_args(L,2,argbuf+1)) {
+    free(argbuf);
+    return luaL_error( L, "expected string or number" );
+  }
+  
+  lua_pushnumber( L, call_func_ptr(_ExecuteEventProcedure,argbuf,n_args) );
+  free(argbuf);
+  return 1;
+}
+
+#endif // OPT_LUA_CALL_NATIVE
 
 void register_lua_funcs( lua_State* L )
@@ -1262 +1437 @@
 
    FUNC(set_record);
-}
+
+#ifdef OPT_LUA_CALL_NATIVE
+   FUNC(call_event_proc);
+   FUNC(call_func_ptr);
+#endif
+}

trunk/include/lolevel.h

@@ -268 +268 @@
 extern void _ScreenLock();
 extern void _SetCurrentCaptureModeType();
+extern unsigned _ExecuteEventProcedure(const char *name,...);
 // known in CHDK as _RefreshPhysicalScreen
 //extern void _ScreenUnLock();

trunk/include/platform.h

@@ -477 +477 @@
 void SetScriptMode(unsigned mode);
 
+/*
+ call C function with argument list created at runtime.
+ See lib/armutil/callfunc.S for documentation
+*/
+unsigned call_func_ptr(void *func, const unsigned *args, unsigned n_args);
+
 #define started() debug_led(1)
 #define finished() debug_led(0)

trunk/lib/Makefile

@@ -2 +2 @@
 include $(topdir)makefile.inc
 
-SUBDIRS=font math ubasic lang lua
+SUBDIRS=font math ubasic lang lua armutil
 
 include $(topdir)bottom.inc

trunk/platform/generic/wrappers.c

@@ -795 +795 @@
 }
 
-void reverse_bytes_order(char* start, int count){
-// note, we will go to count rounded up to the nearest 32
-asm volatile(
-        "ldr    r2, =0xFF00FF\n"        // r2 = mask
-        "add    r1, r0, r1\n"           // r1 = start + count
-"LOOP:\n"
-        "ldm    r0, {R4-R11}\n"         // load 8 words
-        
-        // out = ((in>>8) & 0xFF00FF) | ((in&0xFF00FF) << 8);
-        "mov    r3, r4, lsr #8\n"       // r3 = in >> 8
-        "and    r3, r3, r2\n"           // r3 &= 0xFF00FF
-        "and    r4, r4, r2\n"           // r4 = in & 0xFF00FF
-        "orr    r4, r3, r4, asl #8\n" // out = r3 | (r4 << 8)
-
-        "mov    r3, r5, lsr #8\n"
-        "and    r3, r3, r2\n"
-        "and    r5, r5, r2\n"
-        "orr    r5, r3, r5, asl #8\n"
-
-        "mov    r3, r6, lsr #8\n"
-        "and    r3, r3, r2\n"
-        "and    r6, r6, r2\n"
-        "orr    r6, r3, r6, asl #8\n"
-
-        "mov    r3, r7, lsr #8\n"
-        "and    r3, r3, r2\n"
-        "and    r7, r7, r2\n"
-        "orr    r7, r3, r7, asl #8\n"
-
-        "mov    r3, r8, lsr #8\n"
-        "and    r3, r3, r2\n"
-        "and    r8, r8, r2\n"
-        "orr    r8, r3, r8, asl #8\n"
-
-        "mov    r3, r9, lsr #8\n"
-        "and    r3, r3, r2\n"
-        "and    r9, r9, r2\n"
-        "orr    r9, r3, r9, asl #8\n"
-
-        "mov    r3, r10, lsr #8\n"
-        "and    r3, r3, r2\n"
-        "and    r10, r10, r2\n"
-        "orr    r10, r3, r10, asl #8\n"
-
-        "mov    r3, r11, lsr #8\n"
-        "and    r3, r3, r2\n"
-        "and    r11, r11, r2\n"
-        "orr    r11, r3, r11, asl #8\n"
-
-        "stmia  r0!, {r4-r11}\n"        // store and increment
-
-        "cmp    r0, r1\n"
-        "bcc    LOOP\n"
-        :::"r0","r1","r2","r3","r4","r5","r6","r7","r8","r9","r10","r11"
- );
-}
-
 #if defined (DNG_EXT_FROM)