TEENSY: module handling - wip

Author: chrisws

src/common/plugins.c

@@ -20,16 +20,15 @@
 #define WIN_EXTLIB
 #define LIB_EXT ".dll"
 #elif defined(_MCU)
-
+#define LIB_EXT ""
 #elif defined(_UnixOS)
 #include <dlfcn.h>
 #define LNX_EXTLIB
 #define LIB_EXT ".so"
 #endif
 
-#if defined(LNX_EXTLIB) || defined(WIN_EXTLIB)
+#if defined(LNX_EXTLIB) || defined(WIN_EXTLIB) || defined(_MCU)
 #include "common/plugins.h"
-#include <dirent.h>
 
 #define MAX_SLIBS 64
 #define MAX_PARAM 16
@@ -64,7 +63,29 @@ typedef struct {
 
 static slib_t *plugins[MAX_SLIBS];
 
-#if defined(LNX_EXTLIB)
+#if defined(_MCU)
+int slib_llopen(slib_t *lib) {
+  lib->_handle = plugin_lib_open(lib->_fullname);
+  if (lib->_handle == NULL) {
+    sc_raise("LIB: error on loading %s\n", lib->_name);
+  }
+  return (lib->_handle != NULL);
+}
+
+void *slib_getoptptr(slib_t *lib, const char *name) {
+  return plugin_lib_address(lib->_handle, name);
+}
+
+static int slib_llclose(slib_t *lib) {
+  if (!lib->_handle) {
+    return 0;
+  }
+  plugin_lib_close(lib->_handle);
+  lib->_handle = NULL;
+  return 1;
+}
+
+#elif defined(LNX_EXTLIB)
 int slib_llopen(slib_t *lib) {
   lib->_handle = dlopen(lib->_fullname, RTLD_NOW);
   if (lib->_handle == NULL) {

src/common/plugins.h

@@ -19,6 +19,22 @@
 extern "C" {
 #endif
 
+//
+// lowlevel - open the named library
+//
+void *plugin_lib_open(const char *name);
+
+//
+// lowlevel -return a pointer to the give library function name
+// name could be one of the method names in module.h
+//
+void *plugin_lib_address(void *handle, const char *name);
+
+//
+// lowlevel -close the named library
+//
+void plugin_lib_close(void *handle);
+
 //
 // initialise the plugin system
 //

src/common/scan.c

@@ -3937,7 +3937,7 @@ char *comp_load(const char *file_name) {
     buf = NULL;
     panic(MSG_CANT_OPEN_FILE, comp_file_name);
   } else {
-    int size;
+    size_t size;
 
     size = lseek(h, 0, SEEK_END);
     lseek(h, 0, SEEK_SET);

src/include/module.h

@@ -116,7 +116,7 @@ int sblib_func_exec(int index, int param_count, slib_par_t *params, var_t *retva
  * @param cls_id the variable class identifier
  * @param id the variable instance identifier
  */
-void sblib_free(int cls_id, int id);
+int sblib_free(int cls_id, int id);
 
 /**
  * @ingroup modlib

src/platform/teensy/CMakeLists.txt

@@ -43,7 +43,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 
 # Add executable with the list of source files
-add_executable(${TARGET}.elf src/noop.c src/device.cpp src/main.cpp)
+add_executable(${TARGET}.elf src/noop.c src/device.cpp src/main.cpp src/module.cpp src/teensy.cpp)
 
 # enable all warnings in main.cpp
 target_compile_options(${TARGET}.elf PRIVATE -Wall)

src/platform/teensy/main.bas

@@ -0,0 +1,8 @@
+for i = 0 to 100
+  print "hello " + i
+  delay 100
+next
+print "done !"
+
+
+

src/platform/teensy/src/device.cpp

@@ -90,7 +90,7 @@ void dev_printf(const char *format, ...) {
   static char _buffer[1024];
   va_list args;
   va_start(args, format);
-  unsigned size = vsnprintf(NULL, 0, format, args);
+  unsigned size = vsnprintf(nullptr, 0, format, args);
   va_end(args);
 
   if (size < sizeof(_buffer)) {
@@ -107,7 +107,7 @@ void log_printf(const char *format, ...) {
   if (opt_verbose) {
     va_list args;
     va_start(args, format);
-    unsigned size = vsnprintf(NULL, 0, format, args);
+    unsigned size = vsnprintf(nullptr, 0, format, args);
     va_end(args);
 
     if (size) {

src/platform/teensy/src/main.cpp

@@ -12,17 +12,51 @@
 #include "config.h"
 #include "common/sbapp.h"
 #include "main_bas.h"
+#include "module.h"
 
 #define MAIN_BAS "__main_bas__"
 
+void *plugin_lib_open(const char *name) {
+  void *result = nullptr;
+  if (strcmp(name, "teensy") == 0) {
+    result = get_teensy_module();
+  }
+  return result;
+}
+
+void *plugin_lib_address(void *handle, const char *name) {
+  auto *pModule = (s_module *)handle;
+  void *result = nullptr;
+  if (strcmp(name, "sblib_func_exec") == 0) {
+    result = (void *)pModule->_func_exec;
+  } else if (strcmp(name, "sblib_proc_exec") == 0) {
+    result = (void *)pModule->_proc_exec;
+  } else if (strcmp(name, "sblib_free") == 0) {
+    result = (void *)pModule->_free;
+  } else if (strcmp(name, "sblib_proc_count")  == 0){
+    result = (void *)pModule->_proc_count;
+  } else if (strcmp(name, "sblib_proc_getname") == 0) {
+    result = (void *)pModule->_proc_getname;
+  } else if (strcmp(name, "sblib_func_count") == 0) {
+    result = (void *)pModule->_func_count;
+  } else if (strcmp(name, "sblib_func_getname") == 0) {
+    result = (void *)pModule->_func_getname;
+  }
+  return result;
+}
+
+void plugin_lib_close(void *handle) {
+  // unused
+}
+
 char *dev_read(const char *fileName) {
   char *buffer;
   if (strcmp(fileName, MAIN_BAS) == 0) {
     buffer = (char *)malloc(main_bas_len + 1);
     memcpy(buffer, main_bas, main_bas_len);
     buffer[main_bas_len] = '\0';
   } else {
-    buffer = NULL;
+    buffer = nullptr;
   }
   return buffer;
 }

src/platform/teensy/src/main_bas.h

@@ -0,0 +1,10 @@
+unsigned char main_bas[] = {
+  0x66, 0x6f, 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x74, 0x6f,
+  0x20, 0x31, 0x30, 0x30, 0x0a, 0x20, 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74,
+  0x20, 0x22, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x22, 0x20, 0x2b, 0x20,
+  0x69, 0x0a, 0x20, 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x20, 0x31, 0x30,
+  0x30, 0x0a, 0x6e, 0x65, 0x78, 0x74, 0x0a, 0x70, 0x72, 0x69, 0x6e, 0x74,
+  0x20, 0x22, 0x64, 0x6f, 0x6e, 0x65, 0x20, 0x21, 0x22, 0x0a, 0x0a, 0x0a,
+  0x0a
+};
+unsigned int main_bas_len = 73;

src/platform/teensy/src/module.cpp

@@ -0,0 +1,48 @@
+// This file is part of SmallBASIC
+//
+// Copyright(C) 2001-2025 Chris Warren-Smith.
+// Copyright(C) 2000 Nicholas Christopoulos
+//
+// This program is distributed under the terms of the GPL v2.0 or later
+// Download the GNU Public License (GPL) from www.gnu.org
+//
+
+#include "config.h"
+#include "common/sbapp.h"
+
+void error(var_p_t var, const char *field, int nMin, int nMax) {
+  char message[256];
+  snprintf(message, sizeof(message), "Invalid Input: [%s] - expected [%d - %d] arguments", field, nMin, nMax);
+  v_setstr(var, message);
+}
+
+void error(var_p_t var, const char *field, int n) {
+  char message[256];
+  snprintf(message, sizeof(message), "Invalid Input: [%s] - expected [%d] arguments", field, n);
+  v_setstr(var, message);
+}
+
+void error(var_p_t var, const char *text) {
+  char message[256];
+  snprintf(message, sizeof(message), "Error: [%s]", text);
+  v_setstr(var, message);
+}
+
+int get_param_int(int argc, slib_par_t *params, int n, int def) {
+  int result;
+  if (n >= 0 && n < argc) {
+    switch (params[n].var_p->type) {
+    case V_INT:
+      result = params[n].var_p->v.i;
+      break;
+    case V_NUM:
+      result = params[n].var_p->v.n;
+      break;
+    default:
+      result = def;
+    }
+  } else {
+    result = def;
+  }
+  return result;
+}