@@ -12,7 +12,9 @@ VPATH += $(MULTIARCH_SRC)
MULTIARCH_SRCS = $(notdir $(wildcard $(MULTIARCH_SRC)/*.c))
ifeq ($(filter %-linux-user, $(TARGET)),$(TARGET))
VPATH += $(MULTIARCH_SRC)/linux
+VPATH += $(MULTIARCH_SRC)/native
MULTIARCH_SRCS += $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*.c))
+MULTIARCH_SRCS += $(notdir $(wildcard $(MULTIARCH_SRC)/native/*.c))
endif
MULTIARCH_TESTS = $(MULTIARCH_SRCS:.c=)
@@ -138,5 +140,33 @@ run-plugin-semiconsole-with-%:
TESTS += semihosting semiconsole
endif
+nativecall: nativecall.c
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(filter-out -static,$(LDFLAGS))
+
+ifneq ($(LD_PREFIX),)
+ifneq ($(LIBNATIVE),)
+run-nativecall: nativecall
+ $(call run-test, $<, $(QEMU) -L $(LD_PREFIX) \
+ --native-bypass $(LIBNATIVE) $<, "nativecall")
+
+run-plugin-nativecall-with-%:
+ $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \
+ -L $(LD_PREFIX) --native-bypass $(LIBNATIVE) \
+ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS) \
+ $(call strip-plugin,$<) 2> $<.err, \
+ $< with $*)
+else
+run-nativecall: nativecall
+ $(call skip-test, $<, "no native library found")
+run-plugin-nativecall-with-%:
+ $(call skip-test, $<, "no native library found")
+endif
+else
+run-nativecall: nativecall
+ $(call skip-test, $<, "no elf interpreter prefix found")
+run-plugin-nativecall-with-%:
+ $(call skip-test, $<, "no elf interpreter prefix found")
+endif
+
# Update TESTS
TESTS += $(MULTIARCH_TESTS)
new file mode 100644
@@ -0,0 +1,121 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <unistd.h>
+
+void compare_memory(const void *a, const void *b, size_t n)
+{
+ const unsigned char *p1 = a;
+ const unsigned char *p2 = b;
+ for (size_t i = 0; i < n; i++) {
+ assert(p1[i] == p2[i]);
+ }
+}
+
+void test_memcpy(char *src)
+{
+ char dest[2000];
+ memcpy(dest, src, 2000);
+ compare_memory(dest, src, 2000);
+}
+
+void test_strncpy(char *src)
+{
+ char dest[2000];
+ strncpy(dest, src, 2000);
+ compare_memory(dest, src, 2000);
+}
+
+void test_strcpy(char *src)
+{
+ char dest[2000];
+ strcpy(dest, src);
+ compare_memory(dest, src, 2000);
+}
+
+void test_strcat()
+{
+ char src[20] = "Hello, ";
+ char dest[] = "world!";
+ char str[] = "Hello, world!";
+ strcat(src, dest);
+ compare_memory(src, str, 13);
+}
+
+void test_memcmp(char *str1, char *str2, char *str3)
+{
+ int result1 = memcmp(str1, str2, 3);
+ int result2 = memcmp(str1, str3, 3);
+ int result3 = memcmp(str3, str1, 3);
+ assert(result1 == 0);
+ assert(result2 < 0);
+ assert(result3 > 0);
+}
+
+void test_strncmp(char *str1, char *str2, char *str3)
+{
+ int result1 = strncmp(str1, str2, 3);
+ int result2 = strncmp(str1, str3, 3);
+ int result3 = strncmp(str3, str1, 3);
+ assert(result1 == 0);
+ assert(result2 < 0);
+ assert(result3 > 0);
+}
+
+void test_strcmp(char *str1, char *str2, char *str3)
+{
+ int result1 = strcmp(str1, str2);
+ int result2 = strcmp(str1, str3);
+ int result3 = strcmp(str3, str1);
+ assert(result1 == 0);
+ assert(result2 < 0);
+ assert(result3 > 0);
+}
+
+void test_memset()
+{
+ char buffer[2000];
+ memset(buffer, 'A', 2000);
+ for (int i = 0; i < 2000; i++) {
+ assert(buffer[i] == 'A');
+ }
+}
+
+/*
+ * When executing execv, an error may occur stating that the shared library from
+ * LD_PRELOAD cannot be preloaded.
+ */
+void test_execv(const char *cmd)
+{
+ char *argv[4];
+ argv[0] = (char *)"/bin/sh";
+ argv[1] = (char *)"-c";
+ argv[2] = (char *)cmd;
+ argv[3] = NULL;
+ execv("/bin/sh", argv);
+}
+
+int main()
+{
+ char buf[2000];
+ for (int i = 0; i < 2000; i++) {
+ buf[i] = 'A' + (i % 26);
+ }
+ char str1[] = "abc";
+ char str2[] = "abc";
+ char str3[] = "def";
+
+ test_memcpy(buf);
+ test_strncpy(buf);
+ test_strcpy(buf);
+ test_memcmp(str1, str2, str3);
+ test_strncmp(str1, str2, str3);
+ test_strcmp(str1, str2, str3);
+ test_strcat();
+ test_memset();
+ test_execv("echo 111");
+
+ return EXIT_SUCCESS;
+}
Introduce a new test for native calls to ensure their functionality. The process involves cross-compiling the test cases, building them as dynamically linked binaries, and running these binaries which necessitates the addition of the appropriate interpreter prefix. Signed-off-by: Yeqi Fu <fufuyqqqqqq@gmail.com> --- tests/tcg/multiarch/Makefile.target | 30 ++++++ tests/tcg/multiarch/native/nativecall.c | 121 ++++++++++++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 tests/tcg/multiarch/native/nativecall.c