search engine rewrite

3rdparty/jsonsax/jsonsax_full.c

@@ -3127,6 +3127,7 @@ typedef WriteBufferData* WriteBuffer;
 
 static void WriteBuffer_Reset(WriteBuffer buffer)
 {
+   buffer->bytes[0] = 0;
    buffer->used = 0;
 }
 

Makefile

@@ -9,7 +9,7 @@ TARGET := cl_test
 
 OBJS_CLASSICSLIVE := $(CLASSICS_LIVE_SOURCES_CLASSICSLIVE:.c=.o)
 OBJS_LIBRETRO := $(CLASSICS_LIVE_SOURCES_LIBRETRO:.c=.o)
-OBJS_TEST := $(CLASSICS_LIVE_DIR)/cl_test.o
+OBJS_TEST := $(CLASSICS_LIVE_DIR)/cl_test.o $(CLASSICS_LIVE_DIR)/cl_test_main.o
 OBJS := $(OBJS_CLASSICSLIVE) $(OBJS_LIBRETRO) $(OBJS_TEST)
 
 .PHONY: all clean
@@ -25,6 +25,9 @@ $(CLASSICS_LIVE_LIBRETRO_DIR)/%.o: $(CLASSICS_LIVE_LIBRETRO_DIR)/%.c
 $(CLASSICS_LIVE_DIR)/cl_test.o: $(CLASSICS_LIVE_DIR)/cl_test.c
 	$(CC) $(CFLAGS_C89) -c $< -o $@
 
+$(CLASSICS_LIVE_DIR)/cl_test_main.o: $(CLASSICS_LIVE_DIR)/cl_test_main.c
+	$(CC) $(CFLAGS_C89) -c $< -o $@
+
 $(TARGET): $(OBJS)
 	$(CC) $(OBJS) -o $@ $(LDFLAGS)
 

cl_abi.c

@@ -1,6 +1,6 @@
 #include "cl_abi.h"
 
-static const cl_abi_t *cl_g_abi = NULL;
+static const cl_abi_t *cl_g_abi = CL_NULL;
 
 cl_error cl_abi_register(const cl_abi_t *abi)
 {
@@ -19,7 +19,10 @@ cl_error cl_abi_register(const cl_abi_t *abi)
         !abi->functions.core.user_data)
       return CL_ERR_PARAMETER_INVALID;
 #if CL_EXTERNAL_MEMORY
-    else if (!abi->functions.external.read || !abi->functions.external.write)
+    else if (!abi->functions.external.read_buffer ||
+             !abi->functions.external.read_value ||
+             !abi->functions.external.write_buffer ||
+             !abi->functions.external.write_value)
       return CL_ERR_PARAMETER_INVALID;
 #endif
     else
@@ -91,22 +94,44 @@ cl_error cl_abi_user_data(cl_user_t *user, unsigned index)
 
 #if CL_EXTERNAL_MEMORY
 
-cl_error cl_abi_external_read(void *dest, cl_addr_t address,
+cl_error cl_abi_external_read_buffer(void *dest, cl_addr_t address,
                               unsigned size, unsigned *read)
 {
-  if (cl_g_abi && cl_g_abi->functions.external.read && dest)
-    return cl_g_abi->functions.external.read(dest, address, size, read);
-  else
+#if CL_SAFETY
+  if (!dest || !read || !cl_g_abi || !cl_g_abi->functions.external.read_buffer)
     return CL_ERR_PARAMETER_NULL;
+#endif
+  return cl_g_abi->functions.external.read_buffer(dest, address, size, read);
+}
+
+cl_error cl_abi_external_read_value(void *dest, cl_addr_t address,
+                              cl_value_type type)
+{
+#if CL_SAFETY
+  if (!dest || !cl_g_abi || !cl_g_abi->functions.external.read_value)
+    return CL_ERR_PARAMETER_NULL;
+#endif
+  return cl_g_abi->functions.external.read_value(dest, address, type);
 }
 
-cl_error cl_abi_external_write(const void *src, cl_addr_t address,
+cl_error cl_abi_external_write_buffer(const void *src, cl_addr_t address,
                                unsigned size, unsigned *written)
 {
-  if (cl_g_abi && cl_g_abi->functions.external.write && src)
-    return cl_g_abi->functions.external.write(src, address, size, written);
-  else
+#if CL_SAFETY
+  if (!src || !written || !cl_g_abi || !cl_g_abi->functions.external.write_buffer)
     return CL_ERR_PARAMETER_NULL;
+#endif
+  return cl_g_abi->functions.external.write_buffer(src, address, size, written);
+}
+
+cl_error cl_abi_external_write_value(const void *src, cl_addr_t address,
+                               cl_value_type type)
+{
+#if CL_SAFETY
+  if (!src || !cl_g_abi || !cl_g_abi->functions.external.write_value)
+    return CL_ERR_PARAMETER_NULL;
+#endif
+  return cl_g_abi->functions.external.write_value(src, address, type);
 }
 
 #endif

cl_abi.h

@@ -38,6 +38,8 @@ cl_error cl_abi_install_memory_regions(cl_memory_region_t **regions,
 
 /**
  * Requests from the frontend the name of the target library or program.
+ * Make sure the string returned remains valid for the lifetime of the
+ *   program.
  * This could be the name of a dynamically linked library, an external
  *   process name, or the name of a program classicslive-integration has
  *   been statically compiled into.
@@ -95,8 +97,11 @@ cl_error cl_abi_user_data(cl_user_t *user, unsigned index);
  * @param size The number of bytes to copy.
  * @param read The number of bytes successfully read.
  */
-cl_error cl_abi_external_read(void *dest, cl_addr_t address,
-                              unsigned size, unsigned *read);
+cl_error cl_abi_external_read_buffer(void *dest, cl_addr_t address,
+  unsigned size, unsigned *read);
+
+cl_error cl_abi_external_read_value(void *dest, cl_addr_t address,
+  cl_value_type type);
 
  /**
   * Instructs the frontend to copy data to external memory.
@@ -106,8 +111,11 @@ cl_error cl_abi_external_read(void *dest, cl_addr_t address,
   * @param size The number of bytes to copy.
   * @param written The number of bytes successfully written.
   */
-cl_error cl_abi_external_write(const void *src, cl_addr_t address,
-                               unsigned size, unsigned *written);
+cl_error cl_abi_external_write_buffer(const void *src, cl_addr_t address,
+  unsigned size, unsigned *written);
+
+cl_error cl_abi_external_write_value(const void *src, cl_addr_t address,
+  cl_value_type type);
 
 #endif
 
@@ -145,13 +153,21 @@ typedef struct
 
     struct external
     {
-      /** @see cl_abi_external_read */
-      cl_error (*read)(void *dest, cl_addr_t address, unsigned size,
-                       unsigned *read);
+      /** @see cl_abi_external_read_buffer */
+      cl_error (*read_buffer)(void *dest, cl_addr_t address, unsigned size,
+                              unsigned *read);
+
+      /** @see cl_abi_external_read_value */
+      cl_error (*read_value)(void *dest, cl_addr_t address,
+                             cl_value_type type);
+
+      /** @see cl_abi_external_write_buffer */
+      cl_error (*write_buffer)(const void *src, cl_addr_t address,
+                               unsigned size, unsigned *written);
 
-      /** @see cl_abi_external_write */
-      cl_error (*write)(const void *src, cl_addr_t address, unsigned size,
-                        unsigned *written);
+      /** @see cl_abi_external_write_value */
+      cl_error (*write_value)(const void *src, cl_addr_t address,
+                              cl_value_type type);
     } external;
   } functions;
 } cl_abi_t;