tccpe: cleanup "imports per ordinal"

- tccpe.c: avoid conflict with imp_sym->st_value, cleanup
- _parseLibs.bat, _tcc.bat: no instructions for usage, removed.

from commit 642b6d0f50

tccpe.c

@@ -813,28 +813,24 @@ static void pe_build_imports(struct pe_info *pe)
         hdr->Name = v + rva_base;
 
         for (k = 0, n = p->sym_count; k <= n; ++k) {
-            int ordinal = 0;
             if (k < n) {
                 int iat_index = p->symbols[k]->iat_index;
                 int sym_index = p->symbols[k]->sym_index;
                 ElfW(Sym) *imp_sym = (ElfW(Sym) *)pe->s1->dynsymtab_section->data + sym_index;
                 ElfW(Sym) *org_sym = (ElfW(Sym) *)symtab_section->data + iat_index;
                 const char *name = pe->s1->dynsymtab_section->link->data + imp_sym->st_name;
+                int ordinal;
 
                 org_sym->st_value = thk_ptr;
                 org_sym->st_shndx = pe->thunk->sh_num;
-                v = pe->thunk->data_offset + rva_base;
+
-                
+                if (dllref)
-                /* ordinal or name */
+                    v = 0, ordinal = imp_sym->st_value; /* ordinal from pe_load_def */
-                ordinal = imp_sym->st_value; /* from pe_load_def, temperary use */
+                else
-                //if (ordinal) printf("ordinal: %d\n", ordinal);
+                    ordinal = 0, v = imp_sym->st_value; /* address from tcc_add_symbol() */
-                if (!ordinal) {
+
-                    section_ptr_add(pe->thunk, sizeof(WORD)); /* hint, not used */
-                    put_elf_str(pe->thunk, name);
-                }
 #ifdef TCC_IS_NATIVE
                 if (pe->type == PE_RUN) {
-                    v = imp_sym->st_value;
                     if (dllref) {
                         if ( !dllref->handle )
                             dllref->handle = LoadLibrary(dllref->name);
@@ -842,13 +838,22 @@ static void pe_build_imports(struct pe_info *pe)
                     }
                     if (!v)
                         tcc_error_noabort("can't build symbol '%s'", name);
-                }
+                } else
 #endif
+                if (ordinal) {
+                    v = ordinal | (ADDR3264)1 << (sizeof(ADDR3264)*8 - 1);
+                } else {
+                    v = pe->thunk->data_offset + rva_base;
+                    section_ptr_add(pe->thunk, sizeof(WORD)); /* hint, not used */
+                    put_elf_str(pe->thunk, name);
+                }
+
             } else {
                 v = 0; /* last entry is zero */
             }
+
             *(ADDR3264*)(pe->thunk->data+thk_ptr) =
-            *(ADDR3264*)(pe->thunk->data+ent_ptr) = (ordinal && pe->type != PE_RUN)?(ADDR3264)1<<(sizeof(ADDR3264)*8-1)|ordinal:v;
+            *(ADDR3264*)(pe->thunk->data+ent_ptr) = v;
             thk_ptr += sizeof (ADDR3264);
             ent_ptr += sizeof (ADDR3264);
         }
@@ -1593,12 +1598,11 @@ static char *get_line(char *line, int size, int fd)
 /* ------------------------------------------------------------- */
 static int pe_load_def(TCCState *s1, int fd)
 {
-    int state = 0, ret = -1, dllindex = 0;
+    int state = 0, ret = -1, dllindex = 0, ord;
-    char line[400], dllname[80], *p;
+    char line[400], dllname[80], *p, *x;
 
     for (;;) {
-        int ord = 0;
+
-        char *x, *d, idxstr[8];
         p = get_line(line, sizeof line, fd);
         if (NULL == p)
             break;
@@ -1621,24 +1625,19 @@ static int pe_load_def(TCCState *s1, int fd)
         case 2:
             dllindex = add_dllref(s1, dllname);
             ++state;
-
+            /* fall through */
         default:
-            /* get ordianl and will store in sym->st_value */
+            /* get ordinal and will store in sym->st_value */
-            d = NULL;
+            ord = 0;
-            x = strchr(line, ' ');
+            x = strchr(p, ' ');
-            if (x) x = strchr(line, '@');
+            if (x) {
-            while (x != NULL) {
+                *x = 0, x = strrchr(x + 1, '@');
-                d =x;
+                if (x) {
-                x = strchr(x+1, '@');
+                    char *d;
-            }
+                    ord = (int)strtol(x + 1, &d, 10);
-            if (d) {
+                    if (*d)
-                ord = atoi(d+1);
+                        ord = 0;
-                itoa(ord, idxstr, 10);
+                }
-                if (strcmp(idxstr, d+1) == 0) {
-                    memset(d, 0, 1);
-                    trimback(p, d);
-                } else
-                    ord = 0;
             }
             pe_putimport(s1, dllindex, p, ord);
             continue;

win32/_parseLibs.bat

@@ -1,79 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-pushd %~dp0
-
-::Define as main parameters
-set _Args_=
-set _LIBs_=
-set LIBi=
-
-set ARGSO=-IExt\include -LExt\lib %*
-
-::This is for the .def file also have a similar name .c file
-::.a file will be larger than .def + .c
-::*-uuid.c files are suitable to form libuuid.a
-::w32api-3.17.2
-:GetRLib
-for %%i in (%ARGSO%) do (
-  set ARG=%%i
-  set OPT=!ARG:~0,2!
-  if "!OPT!"=="-l" (
-    set LIB=!ARG:~2!
-    set LIBi=
-    if "!LIB!"=="uuid" (
-      set LIBi= lib\*uid.c
-    ) else (
-      if "!LIB!"=="vfw32" (
-        set LIBi= lib\msvfw32.def lib\avifil32.def lib\avicap32.def
-      ) else (
-        call :GetLibS
-      )
-    )
-    if "!LIBi!"=="" (
-      set _Args_=!_Args_! %%i
-    ) else (
-      set LIBi=!LIBi:%~dp0=!
-      set _LIBs_=!_LIBs_! !LIBi!
-      echo For lib !LIB! will use:
-      echo !LIBi!
-      echo.
-    )
-  ) else (
-    set _Args_=!_Args_! %%i
-  )
-)
-
-::GetRLib End
-popd
-
-tcc.exe !_Args_! !_LIBs_!
-
-exit /b
-
-::::::::::
-
-:GetLibS
-for %%D in (-Llib %ARGSO%) do (
-  set ARG_=%%D
-  set OPT_=!ARG_:~0,2!
-  set LIBD=
-  if "!OPT_!"=="-L" (
-    set LIBD=!ARG_:~2!
-    if exist "!LIBD!" call :GetDLib
-  )
-)
-set LIBD=
-set OPT_=
-set ARG_=
-exit /b
-::GetLibD End
-
-:GetDLib
-pushd !LIBD!
-for /f "usebackq delims=" %%I in (`"dir /b /s !LIB!.c !LIB!_*.c !LIB!.def !LIB!_*.def 2>nul"`) do (
-  set LIBi=!LIBi! "%%I"
-)
-popd
-exit /b
-::GetDLib End

win32/_tcc.bat

@@ -1,30 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-pushd %~dp0
-
-path %~dp0;%path%
-
-set EXT=.exe
-echo %*|findstr /R /C:"\<-c\>" >nul &&set EXT=.o
-echo %*|findstr /R /C:"\<-shared\>" >nul &&set EXT=.dll
-
-::1st file found must be the main c file to get output file name
-set OUTF=
-call :FINDFN %*
-
-if "%OUTF%"=="" goto :EXIT
-
-call _parseLibs -vv -o "%OUTF%" %*
-
-:EXIT
-popd
-pause
-exit /b
-
-:FINDFN
-for %%i in (%*) do (
-    if exist %%i set OUTF=%%~dpni%EXT%&goto :ENDFDF
-)
-:ENDFDF
-exit /b