From 2eaa1104f7af7afa13e5e9a36020efaa33c0e050 Mon Sep 17 00:00:00 2001 From: grischka Date: Sat, 8 Mar 2008 19:55:47 +0000 Subject: [PATCH] Checkin tiny_libmaker (ar replacement) by Timovj Lahde --- Makefile | 8 +- configure | 15 +- win32/build-tcc.bat | 9 +- win32/include/_mingw.h | 20 +- win32/readme.txt | 94 ++++----- tiny_impdef.c => win32/tools/tiny_impdef.c | 0 win32/tools/tiny_libmaker.c | 319 +++++++++++++++++++++++++++++ 7 files changed, 393 insertions(+), 72 deletions(-) rename tiny_impdef.c => win32/tools/tiny_impdef.c (100%) create mode 100644 win32/tools/tiny_libmaker.c diff --git a/Makefile b/Makefile index ffd5d5f5..e0757b05 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,10 @@ ifeq ($(GCC_MAJOR),2) CFLAGS+=-m386 -malign-functions=0 else CFLAGS+=-march=i386 -falign-functions=0 -fno-strict-aliasing +ifneq ($(GCC_MAJOR),3) CFLAGS+=-Wno-pointer-sign -Wno-sign-compare endif +endif DISAS=objdump -d INSTALL=install @@ -30,7 +32,7 @@ PROGS=tcc$(EXESUF) ifdef CONFIG_CROSS PROGS+=c67-tcc$(EXESUF) arm-tcc$(EXESUF) endif -PROGS+=tiny_impdef$(EXESUF) +PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF) else ifeq ($(ARCH),i386) PROGS=tcc$(EXESUF) @@ -168,7 +170,9 @@ i386-win32-tcc$(EXESUF): tcc.c i386-gen.c tccelf.c tccasm.c i386-asm.c tcctok.h $(CC) $(CFLAGS) -DTCC_TARGET_PE -o $@ $< $(LIBS) # windows utilities -tiny_impdef$(EXESUF): tiny_impdef.c +tiny_impdef$(EXESUF): win32/tools/tiny_impdef.c + $(CC) $(CFLAGS) -o $@ $< -lkernel32 +tiny_libmaker$(EXESUF): win32/tools/tiny_libmaker.c $(CC) $(CFLAGS) -o $@ $< -lkernel32 # TinyCC runtime libraries diff --git a/configure b/configure index 56fe798c..a98f0789 100755 --- a/configure +++ b/configure @@ -181,7 +181,20 @@ EOF gcc_major="2" if $cc -o $TMPO $TMPC 2> /dev/null ; then - gcc_major="3" + gcc_major="3" +fi +cat > $TMPC <= 4 +return 0; +#else +#error gcc < 4 +#endif +} +EOF + +if $cc -o $TMPO $TMPC 2> /dev/null ; then + gcc_major="4" fi if test x"$1" = x"-h" -o x"$1" = x"--help" ; then diff --git a/win32/build-tcc.bat b/win32/build-tcc.bat index 32cb5e15..e21fdebe 100644 --- a/win32/build-tcc.bat +++ b/win32/build-tcc.bat @@ -2,17 +2,14 @@ @rem batch file to build tcc using gcc and ar from mingw @rem ---------------------------------------------------- : -@if exist ..\config.h goto configready -: -@echo>..\config.h #define TCC_VERSION "0.9.24pre" +@echo>..\config.h #define TCC_VERSION "0.9.24" @echo>>..\config.h #define TCC_TARGET_PE 1 @echo>>..\config.h #define CONFIG_TCCDIR NULL : -:configready -: gcc -Os -fno-strict-aliasing ../tcc.c -o tcc.exe -s gcc -Os -fno-strict-aliasing ../tcc.c -D LIBTCC -c -o libtcc.o -gcc -Os -fno-strict-aliasing ../tiny_impdef.c -o tiny_impdef.exe -s +gcc -Os tools/tiny_impdef.c -o tiny_impdef.exe -s +gcc -Os tools/tiny_libmaker.c -o tiny_libmaker.exe -s mkdir libtcc ar rcs libtcc/libtcc.a libtcc.o del libtcc.o diff --git a/win32/include/_mingw.h b/win32/include/_mingw.h index 90a8b110..257c5237 100644 --- a/win32/include/_mingw.h +++ b/win32/include/_mingw.h @@ -23,22 +23,21 @@ #define __int64 long long #define __int32 long #define __int16 short -#define __int8 char -#define __cdecl __attribute__((__cdecl__)) -#define __stdcall __attribute__((__stdcall__)) -#define __declspec(x) __attribute__((x)) +#define __int8 char +#define __cdecl __attribute__((__cdecl__)) +#define __stdcall __attribute__((__stdcall__)) +#define __declspec(x) __attribute__((x)) #define __MINGW32_VERSION 2.0 #define __MINGW32_MAJOR_VERSION 2 #define __MINGW32_MINOR_VERSION 0 -#define __MSVCRT__ -#define __MINGW_IMPORT extern +#define __MSVCRT__ 1 +#define __MINGW_IMPORT extern #define _CRTIMP -#define __CRT_INLINE extern __inline__ +#define __CRT_INLINE extern __inline__ -#define _WIN32 -#define WIN32 +#define WIN32 1 #ifndef _WINT_T #define _WINT_T @@ -46,7 +45,8 @@ typedef unsigned int wint_t; #endif /* for winapi */ -#define NONAMELESSUNION +#define _ANONYMOUS_UNION +#define _ANONYMOUS_STRUCT #define DECLSPEC_NORETURN #define WIN32_LEAN_AND_MEAN #define DECLARE_STDCALL_P(type) __stdcall type diff --git a/win32/readme.txt b/win32/readme.txt index c453a696..ee176870 100644 --- a/win32/readme.txt +++ b/win32/readme.txt @@ -1,37 +1,34 @@ - TinyCC-PE - --------- - - TinyCC (aka TCC) is a small but hyperfast C compiler, - written by Fabrice Bellard, - + TinyCC + ====== - TinyCC-PE is the TinyCC compiler with an extension to - write PE executables for MS-Windows. + This file contains some additional information for usage of TinyCC + under MS-Windows: - Features: - --------- + Overview: + --------- + TinyCC (aka TCC) is a small but hyperfast C compiler, written by + Fabrice Bellard. - TinyCC-PE can produce console applications, native windows - GUI programs and DLL's. + TinyCC for MS-Windows can produce console applications, native + windows GUI programs and DLL's. - Most of the features pointed out by Fabrice Bellard for the - original version are still valid, i.e: + The package with under 300kb includes a complete C-compiler with + header files and basic system library support. - - SMALL! The package with ~400kb includes a complete C-compiler - with header files for console and GUI applications. + With the -run switch you can run C-sources without any linking + directly from the command line. - - With the -run switch you can run C-sources without any - linking directly from the command line. + TinyCC can be used as dynamic code generator library in your own + program. - - TCC can of course compile itself. + TinyCC can of course compile itself. Compilation: (omit that if you use the binary ZIP package) ------------ - - You must use the MinGW and MSYS tools available at + You can use the MinGW and MSYS tools available at http://www.mingw.org to compile TCC for Windows. Untar the TCC archive and type in the MSYS shell: @@ -48,13 +45,14 @@ Installation: (from the binary ZIP package) ------------- - Just unzip the package to a directory anywhere on your computer. + + The binary package does not include libtcc. If you want tcc as + dynamic code generator, please use the source code distribution. Examples: --------- - For the 'Fibonacci' console example type from the command line: tcc examples\fib.c @@ -69,25 +67,22 @@ tcc examples\hello_dll.c examples\dll.def - Import Definitions: - ------------------- - - TinyCC-PE searches and reads import definition files similar - to libraries. + Import Definition Files: + ------------------------ + To link with Windows system DLLs, TinyCC uses import definition + files (.def) instead of libraries. - The included 'tiny_impdef' program may be used to make .def files - for any DLL, e.g for an 'opengl32.def': + The included 'tiny_impdef' program may be used to make additional + .def files for any DLL. For example: tiny_impdef.exe opengl32.dll - or to the same effect: - - tcc -run tiny_impdef.c opengl32.dll + To use it, put the opengl32.def file into the tcc/lib directory, + and specify -lopengl32 at the tcc commandline. Resource Files: --------------- - TinyCC-PE can now link windows resources in coff format as generated by MINGW's windres.exe. For example: @@ -95,32 +90,25 @@ tcc app.c appres.o -o app.exe - Header Files: - ------------- - - The system header files, except '_mingw.h', are from the - 3.7 mingw distribution. See also: http://www.mingw.org/ - - - Compile TCC: - ------------ + Tiny Libmaker: + -------------- + The included tiny_libmaker tool by Timovj Lahde can be used as + 'ar' replacement to make a library from several object files. - With TCC itself just say: - tcc src\tcc.c -o tcc.new.exe - - Other compilers like mingw-gcc or msvc work as well. - To make libtcc1.a, you need 'ar' from the mingw binutils. + Header Files: + ------------- + The system header files (except _mingw.h) are from the mingw + distribution (http://www.mingw.org/). Documentation and License: -------------------------- - TCC is distributed under the GNU Lesser General Public License (see COPYING file). - Please read the original tcc-doc.html to have all the features - of TCC. Also visit: http://fabrice.bellard.free.fr/tcc/ + Please read tcc-doc.html to have all the features of TCC. Also + visit: http://fabrice.bellard.free.fr/tcc/ - -- - grischka@users.sourceforge.net + + -- grischka@users.sourceforge.net diff --git a/tiny_impdef.c b/win32/tools/tiny_impdef.c similarity index 100% rename from tiny_impdef.c rename to win32/tools/tiny_impdef.c diff --git a/win32/tools/tiny_libmaker.c b/win32/tools/tiny_libmaker.c new file mode 100644 index 00000000..efda78ad --- /dev/null +++ b/win32/tools/tiny_libmaker.c @@ -0,0 +1,319 @@ +/* + * This program is for making libtcc1.a without ar + * tiny_libmaker - tiny elf lib maker + * usage: tiny_libmaker [lib] files... + * Copyright (c) 2007 Timppa + * + * This program is free software but WITHOUT ANY WARRANTY + */ +#include +#include +#include + +/* #include "ar-elf.h" */ +/* "ar-elf.h" */ +/* ELF_v1.2.pdf */ +typedef unsigned short int Elf32_Half; +typedef int Elf32_Sword; +typedef unsigned int Elf32_Word; +typedef unsigned int Elf32_Addr; +typedef unsigned int Elf32_Off; +typedef unsigned short int Elf32_Section; + +#define EI_NIDENT 16 +typedef struct { + unsigned char e_ident[EI_NIDENT]; + Elf32_Half e_type; + Elf32_Half e_machine; + Elf32_Word e_version; + Elf32_Addr e_entry; + Elf32_Off e_phoff; + Elf32_Off e_shoff; + Elf32_Word e_flags; + Elf32_Half e_ehsize; + Elf32_Half e_phentsize; + Elf32_Half e_phnum; + Elf32_Half e_shentsize; + Elf32_Half e_shnum; + Elf32_Half e_shstrndx; +} Elf32_Ehdr; + +typedef struct { + Elf32_Word sh_name; + Elf32_Word sh_type; + Elf32_Word sh_flags; + Elf32_Addr sh_addr; + Elf32_Off sh_offset; + Elf32_Word sh_size; + Elf32_Word sh_link; + Elf32_Word sh_info; + Elf32_Word sh_addralign; + Elf32_Word sh_entsize; +} Elf32_Shdr; + +#define SHT_NULL 0 +#define SHT_PROGBITS 1 +#define SHT_SYMTAB 2 +#define SHT_STRTAB 3 +#define SHT_RELA 4 +#define SHT_HASH 5 +#define SHT_DYNAMIC 6 +#define SHT_NOTE 7 +#define SHT_NOBITS 8 +#define SHT_REL 9 +#define SHT_SHLIB 10 +#define SHT_DYNSYM 11 + +typedef struct { + Elf32_Word st_name; + Elf32_Addr st_value; + Elf32_Word st_size; + unsigned char st_info; + unsigned char st_other; + Elf32_Half st_shndx; +} Elf32_Sym; + +#define ELF32_ST_BIND(i) ((i)>>4) +#define ELF32_ST_TYPE(i) ((i)&0xf) +#define ELF32_ST_INFO(b,t) (((b)<<4)+((t)&0xf)) + +#define STT_NOTYPE 0 +#define STT_OBJECT 1 +#define STT_FUNC 2 +#define STT_SECTION 3 +#define STT_FILE 4 +#define STT_LOPROC 13 +#define STT_HIPROC 15 + +#define STB_LOCAL 0 +#define STB_GLOBAL 1 +#define STB_WEAK 2 +#define STB_LOPROC 13 +#define STB_HIPROC 15 + +typedef struct { + Elf32_Word p_type; + Elf32_Off p_offset; + Elf32_Addr p_vaddr; + Elf32_Addr p_paddr; + Elf32_Word p_filesz; + Elf32_Word p_memsz; + Elf32_Word p_flags; + Elf32_Word p_align; +} Elf32_Phdr; +/* "ar-elf.h" ends */ + +#define ARMAG "!\n" +#define ARFMAG "`\n" + +typedef struct ArHdr { + char ar_name[16]; + char ar_date[12]; + char ar_uid[6]; + char ar_gid[6]; + char ar_mode[8]; + char ar_size[10]; + char ar_fmag[2]; +} ArHdr; + + +unsigned long le2belong(unsigned long ul) { + return ((ul & 0xFF0000)>>8)+((ul & 0xFF000000)>>24) + + ((ul & 0xFF)<<24)+((ul & 0xFF00)<<8); +} + +ArHdr arhdr = { + "/ ", + " ", + "0 ", + "0 ", + "0 ", + " ", + ARFMAG + }; + +ArHdr arhdro = { + " ", + " ", + "0 ", + "0 ", + "0 ", + " ", + ARFMAG + }; + +int main(int argc, char **argv) +{ + FILE *fi, *fh, *fo; + Elf32_Ehdr *ehdr; + Elf32_Shdr *shdr; + Elf32_Sym *sym; + int i, fsize, iarg; + char *buf, *shstr, *symtab = NULL, *strtab = NULL; + int symtabsize = 0, strtabsize = 0; + char *anames = NULL; + int *afpos = NULL; + int istrlen, strpos = 0, fpos = 0, funccnt = 0, funcmax, hofs; + char afile[260], tfile[260], stmp[20]; + + + strcpy(afile, "ar_test.a"); + iarg = 1; + + if (argc < 2) + { + printf("usage: tiny_libmaker [lib] file...\n"); + return 1; + } + for (i=1; ie_shoff + ehdr->e_shstrndx * ehdr->e_shentsize); + shstr = (char *)(buf + shdr->sh_offset); + for (i = 0; i < ehdr->e_shnum; i++) + { + shdr = (Elf32_Shdr *) (buf + ehdr->e_shoff + i * ehdr->e_shentsize); + if (!shdr->sh_offset) continue; + if (shdr->sh_type == SHT_SYMTAB) + { + symtab = (char *)(buf + shdr->sh_offset); + symtabsize = shdr->sh_size; + } + if (shdr->sh_type == SHT_STRTAB) + { + if (!strcmp(shstr + shdr->sh_name, ".strtab")) + { + strtab = (char *)(buf + shdr->sh_offset); + strtabsize = shdr->sh_size; + } + } + } + + if (symtab && symtabsize) + { + int nsym = symtabsize / sizeof(Elf32_Sym); + //printf("symtab: info size shndx name\n"); + for (i = 1; i < nsym; i++) + { + sym = (Elf32_Sym *) (symtab + i * sizeof(Elf32_Sym)); + if (sym->st_shndx && (sym->st_info == 0x11 || sym->st_info == 0x12)) { + //printf("symtab: %2Xh %4Xh %2Xh %s\n", sym->st_info, sym->st_size, sym->st_shndx, strtab + sym->st_name); + istrlen = strlen(strtab + sym->st_name)+1; + anames = realloc(anames, strpos+istrlen); + strcpy(anames + strpos, strtab + sym->st_name); + strpos += istrlen; + if (funccnt >= funcmax) { + afpos = realloc(NULL, funcmax+1000); // 250 func more + funcmax += 1000; + } + afpos[++funccnt] = fpos; + } + } + } + memset(&arhdro.ar_name, ' ', sizeof(arhdr.ar_name)); + strcpy(arhdro.ar_name, argv[iarg]); + arhdro.ar_name[strlen(argv[iarg])] = '/'; + sprintf(stmp, "%-10d", fsize); + memcpy(&arhdro.ar_size, stmp, 10); + fwrite(&arhdro, sizeof(arhdro), 1, fo); + fwrite(buf, fsize, 1, fo); + free(buf); + iarg++; + fpos += (fsize + sizeof(arhdro)); + } + hofs = 8 + sizeof(arhdr) + strpos + (funccnt+1) * sizeof(int); + if ((hofs & 1)) { // align + hofs++; + fpos = 1; + } else fpos = 0; + // write header + fwrite("!\n", 8, 1, fh); + sprintf(stmp, "%-10d", strpos + (funccnt+1) * sizeof(int)); + memcpy(&arhdr.ar_size, stmp, 10); + fwrite(&arhdr, sizeof(arhdr), 1, fh); + afpos[0] = le2belong(funccnt); + for (i=1; i<=funccnt; i++) { + afpos[i] = le2belong(afpos[i] + hofs); + } + fwrite(afpos, (funccnt+1) * sizeof(int), 1, fh); + fwrite(anames, strpos, 1, fh); + if (fpos) fwrite("", 1, 1, fh); + // write objects + fseek(fo, 0, SEEK_END); + fsize = ftell(fo); + fseek(fo, 0, SEEK_SET); + buf = malloc(fsize + 1); + fread(buf, fsize, 1, fo); + fclose(fo); + fwrite(buf, fsize, 1, fh); + fclose(fh); + free(buf); + if (anames) + free(anames); + if (afpos) + free(afpos); + remove(tfile); + return 0; +} -- 2.11.4.GIT