profiler and symbol lookup improvements

Author: braindigitalis

cmake/custom_targets.cmake

@@ -220,7 +220,7 @@ function(symbols TARGETFILE SOURCEFILE)
     set(FILENAME "${CMAKE_BINARY_DIR}/iso/kernel.bin")
     set(OUTNAME "${CMAKE_BINARY_DIR}/iso/${TARGETFILE}")
     add_custom_command(OUTPUT ${OUTNAME}
-        COMMAND /bin/nm -a "${CMAKE_BINARY_DIR}/iso/kernel.bin" | sort -d | gzip -c > "${CMAKE_BINARY_DIR}/iso/kernel.sym"
+        COMMAND /bin/nm -a -n "${CMAKE_BINARY_DIR}/iso/kernel.bin" | grep -E "^[0-9a-fA-F]+ T [^[:space:]]+$" | gzip -c > "${CMAKE_BINARY_DIR}/iso/kernel.sym"
         DEPENDS ${FILENAME})
     add_custom_target(SYMBOLS ALL DEPENDS ${OUTNAME})
     add_dependencies(SYMBOLS "kernel.bin")

include/basic/unified_expression.h

@@ -118,8 +118,7 @@ const char* up_str_expr_strict(struct basic_ctx *ctx);
  *
  * @note No allocation is performed.
  */
-up_value up_make_int(int64_t x);
-
+#define up_make_int(x) ((up_value){ .kind = UP_INT, .v.i = (x) })
 /**
  * @brief Construct a typed value holding a real (double).
  *
@@ -128,19 +127,22 @@ up_value up_make_int(int64_t x);
  *
  * @note No allocation is performed.
  */
-up_value up_make_real(double x);
+#define up_make_real(x) ((up_value){ .kind = UP_REAL, .v.r = (x) })
 
 /**
  * @brief Construct a typed value holding a string pointer.
  *
- * @param s  Pointer to NUL-terminated string to store (may be NULL).
+ * @param x  Pointer to NUL-terminated string to store (may be NULL).
  * @return   up_value tagged as UP_STR with @p s in the string field.
  *
  * @note The pointer is stored as-is; lifetime/ownership of @p s must be
  *       managed by the caller (typically GC-allocated in this interpreter).
  *       No copy is made here.
  */
-up_value up_make_str(const char *s);
+#define up_make_str(x) ({ \
+	const char *up_make_str_s = (x); \
+	(up_value){ .kind = UP_STR, .v.s = up_make_str_s ? up_make_str_s : "" }; \
+})
 
 /**
  * @brief Evaluate a single value expression and return its typed result.

include/debugger.h

@@ -9,10 +9,10 @@
 
 typedef struct symbol
 {
-	char* name;
 	uint64_t address;
 	uint8_t type;
 	struct symbol* next;
+	char name[];
 } symbol_t;
 
 typedef struct stack_frame {

include/memcpy.h

@@ -94,10 +94,6 @@ static inline __attribute__((always_inline)) void memzero(void* dest, size_t len
 	memset(dest, 0, len);
 }
 
-/* ------------------------------------------------------------------------- */
-/* Additional helpers                                                         */
-/* ------------------------------------------------------------------------- */
-
 /**
  * @brief Reverse a block of memory in place.
  *
@@ -108,3 +104,5 @@ static inline __attribute__((always_inline)) void memzero(void* dest, size_t len
  * @return Number of bytes reversed (same as @p n).
  */
 size_t memrev(char* buf, size_t n);
+
+void* memchr(const void *ptr, int c, uint64_t len);

modules/ogg/stb_vorbis.h

@@ -1349,6 +1349,7 @@ static uint8 get8(vorb *z)
    return c;
    }
    #endif
+   return 0;
 }
 
 static uint32 get32(vorb *f)
@@ -1378,6 +1379,7 @@ static int getn(vorb *z, uint8 *data, int n)
       return 0;
    }
    #endif
+   return 0;
 }
 
 static void skip(vorb *z, int n)
@@ -1424,6 +1426,7 @@ static int set_file_offset(stb_vorbis *f, unsigned int loc)
    fseek(f->f, f->f_start, SEEK_END);
    return 0;
    #endif
+   return 0;
 }
 
 
@@ -4552,6 +4555,7 @@ unsigned int stb_vorbis_get_file_offset(stb_vorbis *f)
    #ifndef STB_VORBIS_NO_STDIO
    return (unsigned int) (ftell(f->f) - f->f_start);
    #endif
+   return 0;
 }
 
 #ifndef STB_VORBIS_NO_PULLDATA_API

src/basic/unified_expression.c

@@ -12,28 +12,6 @@
 
 /* ---------- Typed value ---------- */
 
-/* Constructors */
-up_value up_make_int(int64_t x) {
-	up_value v;
-	v.kind = UP_INT;
-	v.v.i = x;
-	return v;
-}
-
-up_value up_make_real(double x) {
-	up_value v;
-	v.kind = UP_REAL;
-	v.v.r = x;
-	return v;
-}
-
-up_value up_make_str(const char *s) {
-	up_value v;
-	v.kind = UP_STR;
-	v.v.s = s ? s : "";
-	return v;
-}
-
 /* Promote INT -> REAL when needed */
 static inline void up_promote_pair(up_value *a, up_value *b) {
 	if (a->kind == UP_REAL || b->kind == UP_REAL) {