Commit: c6c7044686bbba30a90a29f8d90a843ef6e40f16 - motonesas (git)

MOT6502 assembler, disassembler and linker

Commit MetaInfo

• Revisión: c6c7044686bbba30a90a29f8d90a843ef6e40f16 (tree)
• Tiempo: 2013-02-07 11:34:15
• Autor: astoria-d <astoria-d@my-s...>
• Commiter: astoria-d

Log Message

segment clean up done.

Cambiar Resumen

• modified: assembler/segment.c
• modified: libs/obj-format.c
• modified: linker/linker.c
• modified: linker/nesln-main.c

Diferencia incremental

--- a/assembler/segment.c
+++ b/assembler/segment.c
@@ -190,11 +190,11 @@ unsigned short get_current_pc(void) {
     return get_current_seginfo()->current_pc;
 }
 
-void clear_seglist(void) {
+static void clear_seglist(struct seginfo* sg_head) {
     struct seginfo* pseg;
 
     dprint("clear_seglist.\n");
-    pseg = segment_list;
+    pseg = sg_head;
     while (pseg != NULL) {
         struct seginfo* pp = pseg;
         pseg = (struct seginfo*) pseg->list.next;
@@ -342,7 +342,7 @@ int init_segment(void) {
 }
 
 void destroy_segment(void) {
-    clear_seglist(); 
+    clear_seglist(segment_list); 
 }
 
 

--- a/libs/obj-format.c
+++ b/libs/obj-format.c
@@ -249,7 +249,7 @@ struct seghdr* load_segh(FILE* fp) {
         return NULL;
     }
     
-    dprint("segment: %s\n", sgh->seg_name);
+    //dprint("segment: %s\n", sgh->seg_name);
 
     //get sym cnt
     fread(&tmp, 2, 1, fp);
@@ -273,7 +273,7 @@ struct seghdr* load_segh(FILE* fp) {
                 sgh->symbols = sm;
             else
                 dlist_add_tail(sgh->symbols, &sm->list);
-            dprint("  symbol: %s\n", sm->symbol);
+            //dprint("  symbol: %s\n", sm->symbol);
         }
     }
 
@@ -299,7 +299,7 @@ struct seghdr* load_segh(FILE* fp) {
                 sgh->unresolved_symbols = sm;
             else
                 dlist_add_tail(sgh->unresolved_symbols, &sm->list);
-            dprint("  unresolved: %s\n", sm->symbol);
+            //dprint("  unresolved: %s\n", sm->symbol);
         }
     }
 

--- a/linker/linker.c
+++ b/linker/linker.c
@@ -5,12 +5,97 @@
 #include "obj-format.h"
 #include "segment.h"
 
+static struct seginfo* seg_list;
+
+static void clear_seglist(struct seginfo* sg_head) {
+    struct seginfo* pseg;
+
+    struct closed_file {
+        struct slist l;
+        FILE* fp;
+    } * closed_list = NULL;
+    struct closed_file *wk_list;
+
+    dprint("clear_seglist.\n");
+    pseg = sg_head;
+    while (pseg != NULL) {
+        struct seginfo* pp = pseg;
+        pseg = (struct seginfo*) pseg->list.next;
+
+        dlist_remove((struct dlist*)pp);
+        //clear symbol table
+        if (pp->sym_table)
+            clear_symtbl_list(pp->sym_table);
+
+        //clear unresolved symbol table.
+        if (pp->unresolved_symbol)
+            clear_symtbl_list(pp->unresolved_symbol);
+
+        dprint("free segmeng %s: %s\n", pp->out_fname, pp->name);
+        if (pp->name)
+            free(pp->name);
+
+        //clean up files.
+        //must close only one time for the fp!!
+        if (!closed_list) {
+            closed_list = malloc (sizeof(struct closed_file));
+            closed_list->l.next = NULL;
+            closed_list->fp = pp->fp;
+            dprint("file close %s\n", pp->out_fname);
+            fclose(pp->fp);
+        }
+        else {
+            struct closed_file *cl = closed_list;
+            int closed = FALSE;
+            while (cl != NULL) {
+                if (pp->fp == cl->fp) {
+                    closed = TRUE;
+                    break;
+                }
+                cl = cl->l.next;
+            }
+            if (!closed) {
+                cl = malloc (sizeof(struct closed_file));
+                cl->l.next = NULL;
+                cl->fp = pp->fp;
+                slist_add_tail(&closed_list->l, &cl->l);
+                dprint("file close %s\n", pp->out_fname);
+                fclose(pp->fp);
+            }
+        }
+        free(pp->out_fname);
+
+        free(pp);
+    } 
+
+    //clean up closed list.
+    wk_list = closed_list;
+    while (wk_list != NULL) {
+        struct closed_file *pp = wk_list;
+        wk_list = wk_list->l.next;
+        free(pp);
+    }
+}
+
+
 struct seginfo * segh2segi (struct seghdr *sgh, FILE* objfile, const char* fname) {
+
     struct seginfo * pseg = malloc (sizeof(struct seginfo));
 
+    dprint("segment: %s\n", sgh->seg_name);
     dlist_init (&pseg->list);
     pseg->name = strdup(sgh->seg_name);
-    dprint("segment: %s\n", pseg->name);
+    //mv symtable
+    pseg->sym_table = sgh->symbols;
+    sgh->symbols = NULL;
+    pseg->unresolved_symbol = sgh->unresolved_symbols;
+    sgh->unresolved_symbols = NULL;
+
+    pseg->current_pc = 0;
+    pseg->segsize = sgh->seg_data_size;
+
+    pseg->out_fname = strdup(fname);
+    pseg->fp = objfile;
 
     return pseg;
 }
@@ -53,9 +138,12 @@ int load_object (const char* obj_fname) {
             return FALSE;
         }
 
-        //pseg = segh2segi(sgh, fp, obj_fname);
-        ///must make list of seg!!!
-        //
+        pseg = segh2segi(sgh, fp, obj_fname);
+        if (seg_list == NULL)
+            seg_list  = pseg;
+        else 
+            dlist_add_tail(&seg_list->list, &pseg->list);
+        
         //segh_start += sgh->seg_data_size;
 
         clear_segh(sgh);
@@ -63,3 +151,14 @@ int load_object (const char* obj_fname) {
 
     return TRUE;
 }
+
+void destroy_linker(void) {
+    if (seg_list)
+        clear_seglist (seg_list);
+}
+
+int init_linker(void) {
+    seg_list = NULL;
+    return TRUE;
+}
+

--- a/linker/nesln-main.c
+++ b/linker/nesln-main.c
@@ -5,15 +5,24 @@
 #include "tools.h"
 
 
+int init_linker(void);
+void destroy_linker(void);
+
 static char* out_fname = NULL;
 
 int init_datas(void) {
     int ret;
 
+    ret = init_linker();
+    if (!ret) {
+        fprintf(stderr, "linker initalization failed...\n");
+        return FALSE;
+    }
     return TRUE;
 }
 
 void destroy_datas(void) {
+    destroy_linker();
 }
 
 void print_usage(void) {