dmlib: tools/objlink.c comparison

comparison tools/objlink.c @ 1679:7b0c76cd7686

Clean up and improve error handling.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 31 May 2018 13:18:44 +0300
parents	bddedc2e0ebb
children	bd68c9adc7ca

comparison

equal deleted inserted replaced

-:bddedc2e0ebb
+:7b0c76cd7686
 }
 /* Memory block handling
 */
-void reserveMemBlock(int startAddr, int endAddr, const char *blockName, int blockType)
+BOOL dmReserveMemBlock(int startAddr, int endAddr, const char *blockName, int blockType)
 {
 if (startAddr > endAddr)
 {
 dmErrorMsg("ERROR! Block '%s' has startAddr=$%.4x > endAddr=$%.4x!\n",
 blockName, startAddr, endAddr);
-exit(4);
+return FALSE;
 }
 if (nmemBlocks < MAX_FILENAMES)
 {
 memBlocks[nmemBlocks].start = startAddr;
 memBlocks[nmemBlocks].end   = endAddr;
 memBlocks[nmemBlocks].name  = dm_strdup(blockName);
 memBlocks[nmemBlocks].type  = blockType;
 nmemBlocks++;
+return TRUE;
 }
 else
 {
 dmErrorMsg("Maximum number of memBlock definitions (%d) exceeded!\n",
 MAX_FILENAMES);
-exit(4);
+return FALSE;
 }
 }
-int compareMemBlock(const void *cva, const void *cvb)
+int dmCompareMemBlock(const void *cva, const void *cvb)
 {
 const DMMemBlock *a = cva, *b = cvb;
 return a->start - b->start;
 }
 BOOL dmParseSection(const char *arg, unsigned int *sectStart, unsigned int *sectEnd, char **sectName, BOOL canHasName)
 {
 char sectMode, *sep, *str, *namesep;
 unsigned int tmpi;
+BOOL res = FALSE;
 // Define reserved section
 // Create a copy of the argument
 if ((str = dm_strdup(arg)) == NULL)
 {
 dmErrorMsg("Could not allocate temporary string!\n");
-exit(128);
+goto out;
 }
 // Get start address
 if ((sep = strchr(str, '-')) == NULL &&
 (sep = strchr(str, ':')) == NULL)
 {
 dmErrorMsg("Section definition '%s' invalid.\n", arg);
-goto error;
+goto out;
 }
 sectMode = *sep;
 *sep = 0;
 // Get value
 if (!dmGetIntVal(str, sectStart))
 {
 dmErrorMsg("Section start address '%s' in '%s' invalid.\n", str, arg);
-goto error;
+goto out;
 }
 // Check for name
 namesep = strchr(sep + 1, ',');
 if (canHasName && namesep != NULL)
 namesep++;
 if (*namesep == 0)
 {
 dmErrorMsg("Section definition '%s' name is empty. Either specify name or leave it out.\n",
 arg);
-goto error;
+goto out;
 }
 *sectName = dm_strdup(namesep);
 }
 else
 if (namesep != NULL)
 {
 dmErrorMsg("Section definition does not allow a name, syntax error in '%s' at '%s'.\n",
 arg, namesep);
-goto error;
+goto out;
 }
 // Get end address or length
 if (!dmGetIntVal(sep + 1, &tmpi))
 {
 dmErrorMsg("Section %s '%s' in '%s' invalid.\n",
 sectMode == '-' ? "end address" : "length",
 sep + 1, arg);
-goto error;
+goto out;
 }
 if (sectMode == ':')
 {
 *sectEnd = *sectStart + tmpi - 1;
 {
 if (tmpi < *sectStart)
 {
 dmErrorMsg("Section start address > end address in '%s'.\n",
 arg);
-goto error;
+goto out;
 }
 *sectEnd = tmpi;
 }
+res = TRUE;
+out:
 dmFree(str);
-return TRUE;
+return res;
-error:
-dmFree(str);
-return FALSE;
 }
 BOOL dmParseInputFile(char *arg, const int type1, const int type2, const char *desc, BOOL requireAddr)
 {
 // Allocate memory block
 sectLen = sectEnd - sectStart + 1;
 dmMsg(1, "Reserve $%.4x - $%.4x ($%x, %d bytes) as '%s'\n",
 sectStart, sectEnd, sectLen, sectLen, sectName);
-reserveMemBlock(sectStart, sectEnd, sectName, MTYPE_RES);
+if (!dmReserveMemBlock(sectStart, sectEnd, sectName, MTYPE_RES))
+return FALSE;
 }
 break;
 case 13:
 {
 }
 dmPrint(1, " .. OK\n");
 // Add to list of blocks
-reserveMemBlock(loadAddr, endAddr, filename, MTYPE_RES);
+if (!dmReserveMemBlock(loadAddr, endAddr, filename, MTYPE_RES))
+res = DMERR_MALLOC;
 out:
 if (fh != NULL)
 fclose(fh);
 }
 dmPrint(1, " .. OK\n");
 // Add info to list
-reserveMemBlock(destAddr, endAddr, filename, MTYPE_RES);
+if (!dmReserveMemBlock(destAddr, endAddr, filename, MTYPE_RES))
+res = DMERR_MALLOC;
 out:
 if (fh != NULL)
 fclose(fh);
 dmVerbosity = 1;
 // Parse arguments
 if (!dmArgsProcess(argc, argv, optList, optListN,
 argHandleOpt, NULL, OPTH_BAILOUT))
-exit(1);
+goto out;
 if (nsrcFiles < 1)
 {
 dmErrorMsg("Nothing to do. (try --help)\n");
-exit(0);
+goto out;
 }
 // Allocate memory
 memModel = &memoryModels[optMemModel];
 dmMsg(1, "Using memory model #%d '%s', %d bytes.\n",
 optMemModel, memModel->name, memModel->size);
-memory = (Uint8 *) dmMalloc(memModel->size + 32);
+if ((memory = (Uint8 *) dmMalloc(memModel->size + 32)) == NULL)
-if (memory == NULL)
+{
-{
+dmErrorMsg("Could not allocate memory for memory model!\n");
-dmErrorMsg("Could not allocate memory.\n");
+goto out;
-exit(2);
 }
 // Initialize memory
 dmMsg(1, "Initializing memory with ");
 // Add memory model blocks
 dmMsg(1, "Applying memory model restrictions...\n");
 for (int i = 0; i < memModel->nmemBlocks; i++)
 {
-reserveMemBlock(
+if (!dmReserveMemBlock(
 memModel->memBlocks[i].start,
 memModel->memBlocks[i].end,
 memModel->memBlocks[i].name,
-memModel->memBlocks[i].type);
+memModel->memBlocks[i].type))
+goto out;
 }
 // Sort the blocks
-qsort(memBlocks, nmemBlocks, sizeof(DMMemBlock), compareMemBlock);
+qsort(memBlocks, nmemBlocks, sizeof(DMMemBlock), dmCompareMemBlock);
 // Check for overlapping conflicts
 hasOverlaps = FALSE;
 for (int i = 0; i < nmemBlocks; i++)
 for (int j = 0; j < nmemBlocks; j++)
 }
 if (!optAllowOverlap && hasOverlaps)
 {
 dmErrorMsg("Error occured, overlaps not allowed.\n");
-exit(5);
+goto out;
 }
 // Find out start and end-addresses
 startAddr = memModel->size;
 totalSize = endAddr = 0;
 }
 }
 if (startAddr >= memModel->size || endAddr < startAddr)
 {
-dmErrorMsg("Invalid saveblock addresses (start=$%.4x, end=$%.4x)!\n", startAddr, endAddr);
+dmErrorMsg("Invalid saveblock addresses (start=$%.4x, end=$%.4x)!\n",
-exit(8);
+startAddr, endAddr);
+goto out;
 }
 // Output linkfile
 if (optLinkFileName)
 {
 if ((dfile = fopen(optLinkFileName, "wb")) == NULL)
 {
 int err = dmGetErrno();
 dmErrorMsg("Error creating file '%s' #%d: %s.\n",
 optLinkFileName, err, dmErrorStr(err));
-exit(1);
+goto out;
 }
 switch (optLinkFileFormat)
 {
 case FMT_GENERIC:
 else if ((dfile = fopen(optDestName, "wb")) == NULL)
 {
 int err = dmGetErrno();
 dmErrorMsg("Error creating output file '%s' #%d: %s.\n",
 optDestName, err, dmErrorStr(err));
-exit(1);
+goto out;
 }
 else
 dmPrint(1, "to '%s'\n", optDestName);
 // Save loading address
 if (fwrite(&memory[startAddr], dataSize, 1, dfile) < 1)
 {
 int err = dmGetErrno();
 dmErrorMsg("Error writing to file #%d: %s.\n",
 err, dmErrorStr(err));
-}
+goto out;
+}
-fclose(dfile);
+// Describe the memory layout
-// Describe
 if (optDescribe)
-dmDescribeMemory(stdout);
+dmDescribeMemory(dfile != stdout ? stdout : stderr);
+out:
+if (dfile != NULL && dfile != stdout)
+fclose(dfile);
 return 0;
 }

Mercurial > hg > dmlib

comparison tools/objlink.c @ 1679:7b0c76cd7686