Rework output (WIP)

Author: BlockoS

CMakeLists.txt

@@ -10,6 +10,8 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 enable_testing()
 
 include(CheckSymbolExists)
@@ -51,7 +53,7 @@ set(etripator_SRC
     cd.c
     ipl.c
     output.c
-    wla_dx.c
+#    wla_dx.c
 )
 
 set(etripator_HDR
@@ -72,7 +74,7 @@ set(etripator_HDR
     cd.h
     ipl.h
     output.h
-    wla_dx.h
+#    wla_dx.h
 )
 
 add_library(etripator STATIC ${etripator_SRC} ${etripator_HDR})

cli/etripator.c

@@ -57,7 +57,7 @@
 #include <comment.h>
 #include <output.h>
 
-#include <wla_dx.h>                 // [todo]
+//#include <wla_dx.h>                 // [todo]
 
 #include "options.h"
 
@@ -262,49 +262,76 @@ static bool code_extract(FILE *out, SectionArray *arr, int index, MemoryMap *map
     return true;
 }
 
-static void print_header(FILE *out, Section *current, Section *previous) {
+static bool print_header(Output *output, Section *current, Section *previous) {
+    bool ret = false;
     if(previous && ((previous->logical + previous->size) == current->logical)) {
         // ...
     } else if((current->type != SECTION_TYPE_DATA) || (current->data.type != DATA_TYPE_BINARY)) {
-        /* Print header */
-        fprintf(out, "\t.%s\n"
-                    "\t.bank $%03x\n"
-                    "\t.org $%04x\n",
-                (current->type == SECTION_TYPE_CODE) ? "code" : "data", current->page, current->logical);
+        const char *str = (current->type == SECTION_TYPE_CODE) ? ".code" : ".data";
+        if(output_fill_n(output, ' ', 4U) != true) {
+                // ...
+        } else if(output_string(output, str) != true) {
+            // ... 
+        } else if(output_newline(output) != true) {
+            // ...
+        } else if(output_fill_n(output, ' ', 4U) != true) {
+                // ...
+        } else if(output_string(output, ".bank ") != true) {
+            // ... 
+        } else if(output_8h(output, current->page) != true) {
+            // ...
+        } else if(output_newline(output) != true) {
+            // ...
+        } else if(output_fill_n(output, ' ', 4U) != true) {
+            // ...
+        } else if(output_string(output, ".org ") != true) {
+            // ... 
+        } else if(output_16h(output, current->offset) != true) {
+            // ...
+        } else if(output_newline(output) != true) {
+            // ...
+        } else {
+            ret = true;
+        }
     }
+    return ret;
 }
 
-static bool disassemble(SectionArray *arr, MemoryMap *map, LabelRepository *labels, CommentRepository *comments, CommandLineOptions *options) {
+static bool disassemble(OutputRegistry *registry, SectionArray *arr, MemoryMap *map, LabelRepository *labels, CommentRepository *comments, CommandLineOptions *options) {
     bool ret = true;
     Section *previous = NULL;
     Section *current = NULL;
     for (int i = 0; ret && (i < arr->count); ++i, previous=current) {
-        current = &arr->data[i];
-        FILE *out = fopen(current->output, "ab");
-        if (out == NULL) {
-            ERROR_MSG("Can't open %s : %s", current->output, strerror(errno));
-        } else {
-            if (options->cdrom && (current->offset != ((current->page << 13) | (current->logical & 0x1fff)))) {
-                size_t offset = current->offset;
-                /* Copy CDROM data */
-                if (!cd_load(options->rom_filename, current->offset, current->size, options->sector_size, current->page, current->logical, map)) {
-                    ERROR_MSG("Failed to load CD data (section %d)", i);
-                } else {
-                    ret = false;
-                }
+        Output *output = NULL;
+        if (options->cdrom && (current->offset != ((current->page << 13) | (current->logical & 0x1fff)))) {
+            size_t offset = current->offset;
+            // Copy CDROM data 
+            if (!cd_load(options->rom_filename, current->offset, current->size, options->sector_size, current->page, current->logical, map)) {
+                ERROR_MSG("Failed to load CD data (section %d)", i);
+            } else {
+                ret = false;
             }
+        }
 
-            if(ret) {
-                print_header(out, current, previous);
+        if(ret) {
+            ret = false;
+            current = &arr->data[i];
+            if(output_find(registry, current->output, &output) != true) {
+                ERROR_MSG("No output registered for %s", current->output);
+            } else if(output_begin(output) != true) {
+                ERROR_MSG("Unable to open %s : %s", current->output, strerror(errno));
+            } else {
                 memory_map_mpr(map, current->mpr);
-        
-                if (current->type == SECTION_TYPE_CODE) {
-                    ret = code_extract(out, arr, i, map, labels, comments, options->address); 
+                if(print_header(output, current, previous) != true) {
+                    // ...
+                } else if (current->type == SECTION_TYPE_CODE) {
+                    // [todo] ret = code_extract(out, arr, i, map, labels, comments, options->address); 
+                    ret = true;
                 } else {
-                    ret = data_extract(out, current, map, labels, comments, options->address);
+                    ret = data_extract(output, current, map, labels, comments, options->address);
                 }
+                output_end(output);
             }
-            fclose(out);
         }
     }
     return ret;
@@ -371,14 +398,14 @@ int main(int argc, char **argv) {
                 // ...
             } else {
                 ret = EXIT_SUCCESS;
-                if(!disassemble(&section_arr, &map, &labels, &comments, &options)) {
+                if(!disassemble(&output, &section_arr, &map, &labels, &comments, &options)) {
                     ret = EXIT_FAILURE;
                 }
                 if (label_output(&labels, &options)) {
                     ret = EXIT_FAILURE;
                 }
 
-                (void)wla_dx_output(&map, &labels, &section_arr, "foobar.sym");
+//                (void)wla_dx_output(&map, &labels, &section_arr, "foobar.sym");
 
             }
         }

decode.c

@@ -157,25 +157,26 @@ bool label_extract(LabelRepository *labels, MemoryMap *map, Section *section) {
     return ret;
 }
 
-static int data_extract_binary(FILE *out, Section *section, MemoryMap *map, LabelRepository *repository) {
+static bool data_extract_binary(Output *output, Section *section, MemoryMap *map, LabelRepository *repository) {
     uint16_t logical;
     int32_t i;
-    for (i = 0, logical = section->logical; i < section->size; i++, logical++) {
+    bool ret = true;
+    for (i = 0, logical = section->logical; ret && (i < section->size); i++, logical++) {
         uint8_t data = memory_map_read(map, logical);
-        fwrite(&data, 1, 1, out);
+        ret = output_raw(output, data);
     }
-    return 1;
+    return ret;
 }
 
-static int data_extract_hex(FILE *out, Section *section, MemoryMap *map, LabelRepository *repository,
+static int data_extract_hex(Output *output, Section *section, MemoryMap *map, LabelRepository *repository,
                             CommentRepository *comments, int extra_infos) {
     const int32_t element_size = section->data.element_size;
     const int32_t elements_per_line = section->data.elements_per_line;
 
     int32_t i, j;
     uint16_t logical;
 
-    size_t line_offset = ftell(out);
+   //size_t line_offset = ftell(out);
     uint8_t line_page = section->page;
     uint16_t line_logical = section->logical;
 
@@ -186,37 +187,51 @@ static int data_extract_hex(FILE *out, Section *section, MemoryMap *map, LabelRe
     uint8_t data[2] = {0};
     int32_t top = 0;
 
+    bool ret = false;
+
     for (i = 0, j = 0, logical = section->logical; i < section->size; i++, logical++) {
         uint8_t page = memory_map_page(map, logical);
         Label label = {0};
         bool has_label = label_repository_find(repository, logical, page, &label);
         if (has_label) {      
             // flush any bytes left in the buffer.
             if (top && (top < element_size)) {
-                fprintf(out, "\n%s.db $%02x", g_spacing, data[0]);
+                ret = output_newline(output);
+                ret = output_fill_n(output, ' ', 4U);
+                ret = output_string(output, ".db");
+                ret = output_char(output, ' ');
+                ret = output_8h(output, data[0]);
+
                 for (int32_t l = 1; l < top; l++) { // useless as top is always equal to 1
-                    fprintf(out, ",$%02x", data[l]);
+                    ret = output_char(output, ',');
+                    ret = output_8h(output, data[l]);
                 }
                 top = 0;
             }
             if (i) {
-                fputc('\n', out);
+                ret = output_newline(output);
             }
-            print_label(out, &label);
+            ret = output_label(output, &label);
             j = 0;
         }
 
         Comment dummy;
         if (comment_repository_find(comments, logical, page, &dummy)) {
             if (has_comment) {
                 if (top && (top < element_size)) {
-                    fprintf(out, "\n%s.db $%02x", g_spacing, data[0]);
+                    ret = output_newline(output);
+                    ret = output_fill_n(output, ' ', 4U);
+                    ret = output_string(output, ".db");
+                    ret = output_char(output, ' ');
+                    ret = output_8h(output, data[0]);
+
                     for (int32_t l = 1; l < top; l++) { // useless as top is always equal to 1
-                        fprintf(out, ",$%02x", data[l]);
+                        ret = output_char(output, ',');
+                        ret = output_8h(output, data[l]);
                     }
                     top = 0;
                 }
-                print_inline_comment(out, (int)(ftell(out) - line_offset), comment.text);
+                ret = output_inline_comment(output, comment.text);
             }
             comment = dummy;
             has_comment = true;
@@ -228,59 +243,56 @@ static int data_extract_hex(FILE *out, Section *section, MemoryMap *map, LabelRe
         if (top >= element_size) {
             char sep;
             if (j == 0) {
-                fputc('\n', out);
+                ret = output_newline(output);
 
-                line_offset = ftell(out);
                 line_logical = logical - top + 1;
                 line_page = page;
 
                 const char *data_decl = (top > 1) ? ".dw" : ".db";
 
-                fprintf(out, "%s%s", g_spacing, data_decl);
+                ret = output_fill_n(output, ' ', 4U);
+                ret = output_string(output, data_decl);
+                
                 sep = ' ';
             } else {
                 sep = ',';
             }
-            fputc(sep, out);
-            fputc('$', out);
-            if (top > 1) {
-                while (top--) {
-                    fprintf(out, "%02x", data[top]);
-                }
-            } else {
-                fprintf(out, "%02x", data[0]);
+            ret = output_char(output, sep);
+            while (top > 1) {
+                top--;
+                ret = output_8h(output, data[top]);
             }
-            top = 0;
             j++;
 
             if (j == elements_per_line) {
                 j = 0;
-                int n = (int)(ftell(out) - line_offset);
                 if (has_comment) {
-                    print_inline_comment(out, n, comment.text);
+                    ret = output_inline_comment(output, comment.text);
                     has_comment = false;
                 } else if (extra_infos) {
-                    print_statement_address(out, n, line_logical, line_page);
+                    ret = output_address_comment(output, line_page, line_logical);
                 }
             }
         }
     }
     // flush remaining bytes
     if (top) {
-        int n = (int)(ftell(out) - line_offset);
         if (has_comment) {
-            print_inline_comment(out, n, comment.text);
+            ret = output_inline_comment(output, comment.text);
             has_comment = false;
         } else if (extra_infos) {
-            print_statement_address(out, n, line_logical, line_page);
+            ret = output_address_comment(output, line_page, line_logical);
         }
-        fprintf(out, "\n%s.db $%02x", g_spacing, data[0]);
+        ret = output_fill_to(output, ' ', 10U);                                     // [todo]
+        ret = output_string(output, ".db");
+        ret = output_8h(output, data[0]);
         for (int32_t j = 1; j < top; j++) { // useless as top is always equal to 1
-            fprintf(out, ",$%02x", data[j]);
+            ret = output_char(output, ',');
+            ret = output_8h(output, data[j]);
         }
     }
-    fputc('\n', out);
-    return 1;
+    ret = output_newline(output);
+    return ret;
 }
 
 static int data_extract_string(FILE *out, Section *section, MemoryMap *map, LabelRepository *repository,
@@ -305,7 +317,7 @@ static int data_extract_string(FILE *out, Section *section, MemoryMap *map, Labe
         Label label = {0};
         bool has_label = label_repository_find(repository, logical, page, &label);
         if (has_label) {
-            if (c) { // close string if neededs
+            if (c) { // close string if needed
                 fputc('"', out);
                 c = 0;
             }
@@ -319,7 +331,7 @@ static int data_extract_string(FILE *out, Section *section, MemoryMap *map, Labe
         Comment dummy = {0};
         if (comment_repository_find(comments, logical, page, &dummy)) {
             if (j) {
-                if (c) { // close string if neededs
+                if (c) { // close string if needed
                     fputc('"', out);
                     c = 0;
                 }
@@ -335,7 +347,7 @@ static int data_extract_string(FILE *out, Section *section, MemoryMap *map, Labe
         // display directives
         if (j == 0) {
             fputc('\n', out);
-            line_offset = ftell(out); // record star of line
+            line_offset = ftell(out); // record start of line
             line_logical = logical;
             line_page = page;
             fprintf(out, "%s.db ", g_spacing);
@@ -501,17 +513,17 @@ static int data_extract_jump_table(FILE *out, Section *section, MemoryMap *map,
 }
 
 /* Process data section. The result will be output has a binary file or an asm file containing hex values or strings. */
-bool data_extract(FILE *out, Section *section, MemoryMap *map, LabelRepository *repository,
+bool data_extract(Output *output, Section *section, MemoryMap *map, LabelRepository *repository,
                  CommentRepository *comments, int extra_infos) {
     switch (section->data.type) {
     case DATA_TYPE_BINARY:
-        return data_extract_binary(out, section, map, repository);
+        return data_extract_binary(output, section, map, repository);
     case DATA_TYPE_HEX:
-        return data_extract_hex(out, section, map, repository, comments, extra_infos);
+        return data_extract_hex(output, section, map, repository, comments, extra_infos);
     case DATA_TYPE_STRING:
-        return data_extract_string(out, section, map, repository, comments, extra_infos);
+        return true; // [todo] data_extract_string(out, section, map, repository, comments, extra_infos);
     case DATA_TYPE_JUMP_TABLE:
-        return data_extract_jump_table(out, section, map, repository, comments, extra_infos);
+        return true; // [todo] data_extract_jump_table(out, section, map, repository, comments, extra_infos);
     default:
         return false;
     }

decode.h

@@ -54,15 +54,15 @@
 bool label_extract(LabelRepository *labels, MemoryMap *map, Section *section);
 
 /// Process data section. The result will be output has a binary file or an asm file containing hex values or strings.
-/// \param [out] out File output.
+/// \param [out] output File output.
 /// \param [in] section Current section.
 /// \param [in] map Memory map.
 /// \param [in] repository Label repository.
 /// \param [in] comments Comments repository.
 /// \param [in] extra_infos Display extra informations as comments (if none set).
 /// \return true upon success.
 /// \return false if an error occured.
-bool data_extract(FILE *out, Section *section, MemoryMap *map, LabelRepository *repository, CommentRepository *comments, int extra_infos);
+bool data_extract(Output *output, Section *section, MemoryMap *map, LabelRepository *repository, CommentRepository *comments, int extra_infos);
 
 /// Process code section.
 /// \param [out] out File output.