WebSVN – Kolibri OS – Diff – /programs/develop/ktcc/trunk/source/tcccoff.c

+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include "coff.h"
+#include "tcc.h"
 #define MAXNSCNS 255		/* MAXIMUM NUMBER OF SECTIONS         */
 #define MAX_STR_TABLE 1000000
 int LineNoFilePtr[MAX_FUNCS];
 int EndAddress[MAX_FUNCS];
 int LastLineNo[MAX_FUNCS];
 int FuncEntries[MAX_FUNCS];
-BOOL OutputTheSection(Section * sect);
+int OutputTheSection(Section * sect);
 short int GetCoffFlags(const char *s);
 void SortSymbolTable(void);
 Section *FindSection(TCCState * s1, const char *sname);
     int dummy2;
     int dummy3;
     unsigned short dummy4;
 } AUXEF;
-int tcc_output_coff(TCCState *s1, FILE *f)
+ST_FUNC int tcc_output_coff(TCCState *s1, FILE *f)
+{
     Section *tcc_sect;
     SCNHDR *coff_sec;
     int file_pointer;
     char *Coff_str_table, *pCoff_str_table;
     int CoffTextSectionNo, coff_nb_syms;
     FILHDR file_hdr;		/* FILE HEADER STRUCTURE              */
     Section *stext, *sdata, *sbss;
+    int i, NSectionsToOutput = 0;
-    int i, NSectionsToOutput = 0;
+    Coff_str_table = pCoff_str_table = NULL;
     stext = FindSection(s1, ".text");
     sdata = FindSection(s1, ".data");
 	tcc_sect = s1->sections[i];
 	coff_sec->s_nlnno = 0;
 	coff_sec->s_lnnoptr = 0;
-	if (do_debug && tcc_sect == stext) {
+	if (s1->do_debug && tcc_sect == stext) {
 	    // count how many line nos data
+    }
     file_hdr.f_symptr = file_pointer;	/* file pointer to symtab */
-    if (do_debug)
+    if (s1->do_debug)
 	file_hdr.f_nsyms = coff_nb_syms;	/* number of symtab entries */
     // group the symbols in order of filename, func1, func2, etc
     // finally global symbols
-    if (do_debug)
+    if (s1->do_debug)
 	SortSymbolTable();
     // write line no data
     for (i = 1; i < s1->nb_sections; i++) {
 	coff_sec = §ion_header[i];
+	    }
+	}
+    }
     // write symbol table
-    if (do_debug) {
+    if (s1->do_debug) {
 	int k;
 	struct syment csym;
 	AUXFUNC auxfunc;
 	AUXBF auxbf;
 	    if (strlen(name) <= 8) {
 		strcpy(csym._n._n_name, name);
 	    } else {
 		if (pCoff_str_table - Coff_str_table + strlen(name) >
 		    MAX_STR_TABLE - 1)
-		    error("String table too large");
+		    tcc_error("String table too large");
 		csym._n._n_n._n_zeroes = 0;
 		csym._n._n_n._n_offset =
 		    if (strcmp(name, Func[k]) == 0)
 			break;
+		}
-		if (k >= nFuncs) {
-		    char s[256];
+		if (k >= nFuncs) {
-		    sprintf(s, "debug info can't find function: %s", name);
-		    error(s);
+		    tcc_error("debug info can't find function: %s", name);
+		}
 		// put a Function Name
 	    p++;
+	}
     }
-    if (do_debug) {
+    if (s1->do_debug) {
 	// write string table
 			if (strcmp(name2, Func[k]) == 0)
 			    break;
+		    }
-		    if (k >= nFuncs) {
-			char s[256];
-			sprintf(s,
+		    if (k >= nFuncs) {
-				"debug (sort) info can't find function: %s",
-				name2);
-			error(s);
+                        tcc_error("debug (sort) info can't find function: %s", name2);
+		    }
+	}
 	p++;
+    }
     if (n != nb_syms)
-	error("Internal Compiler error, debug info");
+	tcc_error("Internal Compiler error, debug info");
     // copy it all back
+    }
     return n;			// total number of symbols
 }
-BOOL OutputTheSection(Section * sect)
+int OutputTheSection(Section * sect)
+{
     const char *s = sect->name;
     if (!strcmp(s, ".text"))
-	return true;
+	return 1;
     else if (!strcmp(s, ".data"))
-	return true;
+	return 1;
     else
 	if (!strcmp(sname, s->name))
 	    return s;
     }
-    error("could not find section %s", sname);
+    tcc_error("could not find section %s", sname);
     return 0;
+}
-int tcc_load_coff(TCCState * s1, int fd)
+ST_FUNC int tcc_load_coff(TCCState * s1, int fd)
+{
     char name2[9];
     FILHDR file_hdr;		/* FILE HEADER STRUCTURE              */
     f = fdopen(fd, "rb");
     if (!f) {
-	error("Unable to open .out file for input");
+	tcc_error("Unable to open .out file for input");
+    }
     if (fread(&file_hdr, FILHSZ, 1, f) != 1)
-	error("error reading .out file for input");
+	tcc_error("error reading .out file for input");
     if (fread(&o_filehdr, sizeof(o_filehdr), 1, f) != 1)
-	error("error reading .out file for input");
+	tcc_error("error reading .out file for input");
     // first read the string table
     if (fseek(f, file_hdr.f_symptr + file_hdr.f_nsyms * SYMESZ, SEEK_SET))
-	error("error reading .out file for input");
+	tcc_error("error reading .out file for input");
     if (fread(&str_size, sizeof(int), 1, f) != 1)
-	error("error reading .out file for input");
+	tcc_error("error reading .out file for input");
     Coff_str_table = (char *) tcc_malloc(str_size);
     if (fread(Coff_str_table, str_size - 4, 1, f) != 1)
-	error("error reading .out file for input");
+	tcc_error("error reading .out file for input");
     // read/process all the symbols
 	    // strip off any leading underscore (except for other main routine)
 	    if (name[0] == '_' && strcmp(name, "_main") != 0)
 		name++;
-	    tcc_add_symbol(s1, name, csym.n_value);
+	    tcc_add_symbol(s1, name, (void*)(uintptr_t)csym.n_value);
+	}
 	// skip any aux records
 	if (csym.n_numaux == 1) {
 	    if (fread(&csym, SYMESZ, 1, f) != 1)
-		error("error reading .out file for input");
+		tcc_error("error reading .out file for input");
 	    i++;

Subversion Repositories Kolibri OS

(root)/programs/develop/ktcc/trunk/source/tcccoff.c – Rev 647 → 6429