added arguments to -run - fixed libc linking when running in memory - output a warning instead of an error if invalid escaped sequence in character

bellard committed 23 years ago

Commit bef87031 parent 46169b91 file · +98 −45Browse files

Unified · Split

tcc.c+98−45

 static void parse_escape_string(CString *outstr, const uint8_t *buf, int is_long)
 {
     int c, n;
-    const char *p;
+    const uint8_t *p;
     p = buf;
     for(;;) {
                 break;
             default:
             invalid_escape:
-                error("invalid escaped char");
+                if (c >= '!' && c <= '~')
+                    warning("unknown escape sequence: \'\\%c\'", c);
+                else
+                    warning("unknown escape sequence: \'\\x%x\'", c);
+                break;
             }
         }
         p++;
     tcc_add_runtime(s1);
+    build_got_entries(s1);
     relocate_common_syms();
     /* compute relocation address : section are relocated in place. We
     Elf32_Ehdr ehdr;
     int fd, ret;
     BufferedFile *saved_file;
     /* find source file type with extension */
     filename1 = strrchr(filename, '/');
     if (filename1)
             if (ehdr.e_type == ET_REL) {
                 ret = tcc_load_object_file(s1, fd, 0);
             } else if (ehdr.e_type == ET_DYN) {
-                ret = tcc_load_dll(s1, fd, filename,
+                if (s1->output_type == TCC_OUTPUT_MEMORY) {
-                                   (flags & AFF_REFERENCED_DLL) != 0);
+                    void *h;
+                    h = dlopen(filename, RTLD_GLOBAL | RTLD_LAZY);
+                    if (h)
+                        ret = 0;
+                    else
+                        ret = -1;
+                } else {
+                    ret = tcc_load_dll(s1, fd, filename,
+                                       (flags & AFF_REFERENCED_DLL) != 0);
+                }
             } else {
                 error_noabort("unrecognized ELF file");
                 goto fail;
 {
     char buf[1024];
     int i;
-    void *h;
     /* first we look for the dynamic library if not static linking */
     if (!s->static_link) {
         snprintf(buf, sizeof(buf), "lib%s.so", libraryname);
-        /* if we output to memory, then we simply we dlopen(). */
+        if (tcc_add_dll(s, buf, 0) == 0)
-        if (s->output_type == TCC_OUTPUT_MEMORY) {
+            return 0;
-            /* Since the libc is already loaded, we don't need to load it again */
-            if (!strcmp(libraryname, "c"))
-                return 0;
-            h = dlopen(buf, RTLD_GLOBAL | RTLD_LAZY);
-            if (h)
-                return 0;
-        } else {
-            if (tcc_add_dll(s, buf, 0) == 0)
-                return 0;
-        }
     }
     /* then we look for the static library */
     { "static", TCC_OPTION_static, 0 },
     { "shared", TCC_OPTION_shared, 0 },
     { "o", TCC_OPTION_o, TCC_OPTION_HAS_ARG },
-    { "run", TCC_OPTION_run, 0 },
+    { "run", TCC_OPTION_run, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },
     { "rdynamic", TCC_OPTION_rdynamic, 0 },
     { "r", TCC_OPTION_r, 0 },
     { "W", TCC_OPTION_W, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },
     { NULL },
 };
-int main(int argc, char **argv)
+/* convert 'str' into an array of space separated strings */
+static int expand_args(char ***pargv, const char *str)
 {
-    char *r;
+    const char *s1;
-    int optind, output_type, multiple_files, i, reloc_output;
+    char **argv, *arg;
-    TCCState *s;
+    int argc, len;
-    char **files;
-    int nb_files, nb_libraries, nb_objfiles, dminus, ret;
-    char objfilename[1024];
-    int64_t start_time = 0;
-    const TCCOption *popt;
-    const char *optarg, *p1, *r1, *outfile;
-    int print_search_dirs;
-    s = tcc_new();
+    argc = 0;
-    output_type = TCC_OUTPUT_EXE;
+    argv = NULL;
+    for(;;) {
+        while (is_space(*str))
+            str++;
+        if (*str == '\0')
+            break;
+        s1 = str;
+        while (*str != '\0' && !is_space(*str))
+            str++;
+        len = str - s1;
+        arg = tcc_malloc(len + 1);
+        memcpy(arg, s1, len);
+        arg[len] = '\0';
+        dynarray_add((void ***)&argv, &argc, arg);
+    }
+    *pargv = argv;
+    return argc;
+}
+static char **files;
+static int nb_files, nb_libraries;
+static int multiple_files;
+static int print_search_dirs;
+static int output_type;
+static int reloc_output;
+static const char *outfile;
+int parse_args(TCCState *s, int argc, char **argv)
+{
+    int optind;
+    const TCCOption *popt;
+    const char *optarg, *p1, *r1;
+    char *r;
-    optind = 1;
+    optind = 0;
-    outfile = NULL;
-    multiple_files = 1;
-    dminus = 0;
-    files = NULL;
-    nb_files = 0;
-    nb_libraries = 0;
-    reloc_output = 0;
-    print_search_dirs = 0;
     while (1) {
         if (optind >= argc) {
             if (nb_files == 0 && !print_search_dirs)
             case TCC_OPTION_HELP:
             show_help:
                 help();
-                return 1;
+                exit(1);
             case TCC_OPTION_I:
                 if (tcc_add_include_path(s, optarg) < 0)
                     error("too many include paths");
                 print_search_dirs = 1;
                 break;
             case TCC_OPTION_run:
-                multiple_files = 0;
+                {
-                output_type = TCC_OUTPUT_MEMORY;
+                    int argc1;
+                    char **argv1;
+                    argc1 = expand_args(&argv1, optarg);
+                    if (argc1 > 0) {
+                        parse_args(s, argc1, argv1);
+                    }
+                    multiple_files = 0;
+                    output_type = TCC_OUTPUT_MEMORY;
+                }
                 break;
             case TCC_OPTION_v:
                 printf("tcc version %s\n", TCC_VERSION);
-                return 0;
+                exit(0);
             case TCC_OPTION_W:
                 {
                     const char *p = optarg;
             }
         }
     }
+    return optind;
+}
+int main(int argc, char **argv)
+{
+    int i;
+    TCCState *s;
+    int nb_objfiles, ret, optind;
+    char objfilename[1024];
+    int64_t start_time = 0;
+    s = tcc_new();
+    output_type = TCC_OUTPUT_EXE;
+    outfile = NULL;
+    multiple_files = 1;
+    files = NULL;
+    nb_files = 0;
+    nb_libraries = 0;
+    reloc_output = 0;
+    print_search_dirs = 0;
+    optind = parse_args(s, argc - 1, argv + 1) + 1;
     if (print_search_dirs) {
         /* enough for Linux kernel */
         printf("install: %s/\n", tcc_lib_path);