WebSVN – Kolibri OS – Diff – /programs/develop/clink/main.c

                                 (epep)->error_code, epep_errors[(epep)->error_code], __LINE__); exit(-1)
 #define ERROR_CDICT(cdict) printf("Error: cdict returned %u at "__FILE__":%u", \
+                                  (cdict)->error_code, __LINE__); exit(-1);
+static int emit_logs;
+static int log_info(const char *fmt, ...) {
+	if (emit_logs) {
+		va_list ap;
+		va_start(ap, fmt);
+		vprintf(fmt, ap);
+		va_end(ap);
+	}
                                   (cdict)->error_code, __LINE__); exit(-1);
 static void fwrite8(FILE *f, uint8_t b) {
 	fputc(b, f);
 	FILE *out = fopen(outname, "wb");
 	char *strtab = cvec_char_new(1024);
 	size_t size_of_sections = 0;
 	size_t number_of_relocations = 0;
-	printf("Calculating all sections size and relocations count... ");
+	log_info("Calculating all sections size and relocations count... ");
 	for (size_t sec_i = 0; sec_i < cvec_pchar_size(&ir->section_names_set); sec_i++) {
 		char *name = ir->section_names_set[sec_i];
 		SectionInfo si = cdict_CStr_SectionInfo_get_v(&ir->info_per_section, name);
 		size_of_sections += si.size;
 		number_of_relocations += si.number_of_relocations;
+	}
-	printf("Done: %u & %u\n", size_of_sections, number_of_relocations);
+	log_info("Done: %u & %u\n", size_of_sections, number_of_relocations);
 	size_t fisrt_section_offset = 20 + 40 * cvec_pchar_size(&ir->section_names_set);
 	size_t offset_to_first_relocation = fisrt_section_offset + size_of_sections;
 	size_t offset_to_next_relocation = offset_to_first_relocation;
 	size_t next_section_offset = fisrt_section_offset;
 	size_t PointerToSymbolTable = fisrt_section_offset + size_of_sections + number_of_relocations * 10;
 	// COFF Header
-	printf("Writing COFF header... ");
+	log_info("Writing COFF header... ");
 	fwrite16(out, 0x14c);                                   // Machine
 	fwrite16(out, cvec_pchar_size(&ir->section_names_set)); // NumberOfSections
 	fwrite32(out, 0);                                       // TimeDataStamp
 	fwrite32(out, PointerToSymbolTable);                    // PointerToSymbolTable
 	fwrite32(out, ir->number_of_symbols);                   // NumberOfSymbols
 	fwrite16(out, 0);                                       // SizeOfOptionalHeader
 	fwrite16(out, 0);                                       // Characteristics
-	printf("Done.\n");
+	log_info("Done.\n");
 	// Section Headers
-	printf("Writing section headers {\n");
+	log_info("Writing section headers {\n");
 	for (size_t sec_i = 0; sec_i < cvec_pchar_size(&ir->section_names_set); sec_i++) {
 		char *name = ir->section_names_set[sec_i];
 		SectionInfo si = cdict_CStr_SectionInfo_get_v(&ir->info_per_section, name);
 		offset_to_next_relocation += si.number_of_relocations * 10;
 		fwrite32(out, 0);                         // PointerToLinenumbers
 		fwrite16(out, si.number_of_relocations);  // NumberOfRelocations
 		fwrite16(out, 0);                         // NumberOfLinenumbers
 		fwrite32(out, si.characteristics);        // Characteristics
-		printf("Done.\n");
+		log_info("Done.\n");
+	}
-	printf("}\n");
+	log_info("}\n");
 	// Section data
-	printf("Writing sections {\n");
+	log_info("Writing sections {\n");
 	for (size_t sec_i = 0; sec_i < cvec_pchar_size(&ir->section_names_set); sec_i++) {
 		char *name = ir->section_names_set[sec_i];
 		SectionInfo si = cdict_CStr_SectionInfo_get_v(&ir->info_per_section, name);
-		printf(" Writing %s... ", name);
+		log_info(" Writing %s... ", name);
 		for (size_t i = 0; i < cvec_ObjIdSecId_size(&si.source); i++) {
 			ObjIdSecId id = cvec_ObjIdSecId_at(&si.source, i);
+				}
+			}
 			fwrite(buf, 1, sh.SizeOfRawData, out);
 		}
-		printf("Done.\n");
+		log_info("Done.\n");
 	}
-	printf("}\n");
+	log_info("}\n");
 	// COFF Relocations
 	char **undefined_symbols = cvec_pchar_new(8);
-	printf("Writing COFF Relocations {\n");
+	log_info("Writing COFF Relocations {\n");
 	for (size_t sec_i = 0; sec_i < cvec_pchar_size(&ir->section_names_set); sec_i++) {
 		char *name = ir->section_names_set[sec_i];
 		SectionInfo si = cdict_CStr_SectionInfo_get_v(&ir->info_per_section, name);
-		printf(" Writing relocations of %s {\n", name);
+		log_info(" Writing relocations of %s {\n", name);
 				EpepCoffRelocation rel = { 0 };
 				if (!epep_get_section_relocation_by_index(epep, &sh, &rel, rel_i)) {
 					ERROR_EPEP(epep);
 				}
-				printf("  { %02x, %02x, %02x }", rel.VirtualAddress, rel.SymbolTableIndex, rel.Type);
+				log_info("  { %02x, %02x, %02x }", rel.VirtualAddress, rel.SymbolTableIndex, rel.Type);
 				rel.VirtualAddress += object->section_offsets[sec_i];
+				{
 					size_t index = rel.SymbolTableIndex;
 					if (old_sym.name == NULL) {
 						add_name_to_set(strdup(name), &undefined_symbols);
+					}
 					rel.SymbolTableIndex = old_sym.index;
-					printf(" -> { %02x, %02x, %02x }: ", rel.VirtualAddress, rel.SymbolTableIndex, rel.Type);
+					log_info(" -> { %02x, %02x, %02x }: ", rel.VirtualAddress, rel.SymbolTableIndex, rel.Type);
-					printf("New relocation of %s in %s\n", name, sh.Name);
+					log_info("New relocation of %s in %s\n", name, sh.Name);
+				}
 				fwrite(&rel, 1, 10, out);
+			}
 		}
-		printf(" }\n");
+		log_info(" }\n");
 	}
-	printf("}\n");
+	log_info("}\n");
 	if (cvec_pchar_size(&undefined_symbols) > 0) {
 		printf("Undefined symbols found, aborting\nUndefined:\n");
 		for (int i = 0; i < cvec_pchar_size(&undefined_symbols); i++) {
 			printf("%s\n", undefined_symbols[i]);
+		}
 		exit(-1);
 	}
 	// Symbols Table
-	printf("Writing symbols {\n");
+	log_info("Writing symbols {\n");
 			} else {
 				memcpy(sec_name, sh.Name, 8);
 				sec_name[8] = '\0';
+			}
-			printf("%s:\n", sym.name);
+			log_info("%s:\n", sym.name);
-			printf(" Section:      %s\n", sec_name);
+			log_info(" Section:      %s\n", sec_name);
-			printf(" StorageClass: %u\n", sym.sym.symbol.StorageClass);
+			log_info(" StorageClass: %u\n", sym.sym.symbol.StorageClass);
 			sym.sym.symbol.SectionNumber = get_section_number(&ir->section_names_set, sec_name);
+		}
 		for (size_t aux_i = 0; aux_i < sym.sym.symbol.NumberOfAuxSymbols; aux_i++) {
 			fwrite(&sym.auxes[aux_i].symbol, 1, 18, out);
+		}
+	}
-	printf("}\n");
+	log_info("}\n");
 	// COFF String Table
-	printf("Writing COFF String Table... ");
+	log_info("Writing COFF String Table... ");
 	fwrite32(out, cvec_pchar_size(&strtab) + 4);
 	fwrite(strtab, 1, cvec_pchar_size(&strtab), out);
-	printf("Done.\n");
+	log_info("Done.\n");
+}
 static ObjectIr parse_objects(int argc, char **argv) {
 	CoffObject *objects = cvec_CoffObject_new(128);
 	char **section_names_set = cvec_pchar_new(4);
 	char **sym_name_set = cvec_pchar_new(128);
+	size_t number_of_symbols = 0;
+	for (int i = 1; i < argc; i++) {
+		// If one arg is NULL, that means it was a parameter and was cleared
+		// It's not a input file name
+		if (argv[i] == NULL) {
-	size_t number_of_symbols = 0;
+			continue;
+		}
 	for (int i = 1; i < argc; i++) {
-		printf("Primary parsing of %s... ", argv[i]);
+		log_info("Primary parsing of %s... ", argv[i]);
+			}
+		}
 		cvec_CoffObject_push_back(&objects, object);
-		printf("Done.\n");
+		log_info("Done.\n");
+	}
 	if (!cdict_CStr_SectionInfo_init(&info_per_section)) {
 		ERROR_CDICT(&info_per_section);
+	}
 	for (size_t i = 0; i < cvec_CoffObject_size(&objects); i++) {
-		printf("Secondary parsing of %s {\n", objects[i].name);
+		log_info("Secondary parsing of %s {\n", objects[i].name);
 		Epep *epep = &(objects[i].epep);
 		if (!epep_get_string_table(epep, strtab)) {
 			ERROR_EPEP(epep);
+		}
 		// Fill symbols table
-		printf(" Symbols {\n");
+		log_info(" Symbols {\n");
 		for (size_t sym_i = 0; sym_i < epep->coffFileHeader.NumberOfSymbols; sym_i++) {
 			EpepCoffSymbol sym = { 0 };
 				if (!cdict_CStr_Symbol_add_vv(&symtab, strdup(name), new_sym, CDICT_NO_CHECK)) {
 					ERROR_CDICT(&symtab);
+				}
 				number_of_symbols++;
-				printf("  Symbol #%u: %s (%u auxes, #%u)\n", sym_i, name, cvec_EpepCoffSymbol_size(&auxes), number_of_symbols - 1);
+				log_info("  Symbol #%u: %s (%u auxes, #%u)\n", sym_i, name, cvec_EpepCoffSymbol_size(&auxes), number_of_symbols - 1);
 				add_name_to_set(strdup(name), &sym_name_set);
+			}
 			sym_i += sym.symbol.NumberOfAuxSymbols;
 		}
-		printf(" }\n");
+		log_info(" }\n");
 		// Set section offsets and fill unique section name set
-		printf(" Sections {\n");
+		log_info(" Sections {\n");
 			si.characteristics |= sh.Characteristics;
 			si.number_of_relocations += sh.NumberOfRelocations;
 			cvec_ObjIdSecId_push_back(&si.source, (ObjIdSecId){ i, sec_i });
 			cdict_CStr_SectionInfo_add_vv(&info_per_section, strdup(name), si, CDICT_REPLACE_EXIST);
-			printf("  Section #%llu {\n", sec_i);
+			log_info("  Section #%llu {\n", sec_i);
-			printf("   Name:                      %s\n", name);
+			log_info("   Name:                      %s\n", name);
-			printf("   Virtual Address:           %u\n", sh.VirtualAddress);
+			log_info("   Virtual Address:           %u\n", sh.VirtualAddress);
-			printf("   Characteristics:           %08x\n", sh.Characteristics);
+			log_info("   Characteristics:           %08x\n", sh.Characteristics);
-			printf("   Offset in the big section: %u\n", objects[i].section_offsets[sec_i]);
+			log_info("   Offset in the big section: %u\n", objects[i].section_offsets[sec_i]);
-			printf("  }\n");
+			log_info("  }\n");
-			if (sh.VirtualAddress != 0) {
-				printf("\n\n\n\n");
-				for (int i = 0; i < 42; i++) {
-					printf("!!!");
-				}
-				printf("\n\n\n\n\nWARNING: Handling of section with Virtual Address another that 0 is not implemented\n\n\n\n\n");
-				for (int i = 0; i < 42; i++) {
-					printf("!!!");
 			if (sh.VirtualAddress != 0) {
-				printf("\n\n\n\n");
+				printf("Warning: Handling of section with Virtual Address another that 0 is not implemented");
 			}
 		}
-		printf(" }\n");
+		log_info(" }\n");
-		printf("}\n");
+		log_info("}\n");
+	}
 int first_arg(int argc, char **argv, const char *arg) {
 	return argc >= 2 && !strcmp(argv[1], arg);
+}
+int arg_got_flag(int argc, char **argv, ...) {
+	char *arg_names[8];
+	int arg_name_c = 0;
+	va_list ap;
+	va_start(ap, argv);
+	for (char *arg_name = va_arg(ap, char *); arg_name; arg_name = va_arg(ap, char *)) {
+		if (arg_name_c >= 8) {
+			printf("Internal error: Too many parameter aliases passed to %s", __func__);
+			exit(-1);
+		}
+		arg_names[arg_name_c++] = arg_name;
+	}
+	va_end(ap);
+	for (int i = 1; i < argc; i++) {
+		for (int arg_name_i = 0; arg_name_i < arg_name_c; arg_name_i++) {
+			char *arg_name = arg_names[arg_name_i];
+			if (!strcmp(argv[i], arg_name)) {
+				argv[i] = NULL; // Do not handle this argument as a input name
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
 int main(int argc, char **argv) {
 	const char *outname = "a.out.obj";
 		printf("  %s [-h|-help|--help]\n", argv[0]);
 		printf("    Output this help\n");
 		return 0;
+	}
+	emit_logs = arg_got_flag(argc, argv, "-v", "-verbose", "--verbose", 0);
 	ObjectIr ir = parse_objects(argc, argv);
 	build(&ir, outname);
 	return 0;

Subversion Repositories Kolibri OS

(root)/programs/develop/clink/main.c – Rev 9080 → 9084