Commit: ae0889a7d762f5235290c665d15a558cf5352c3b - motonesas (git)

MOT6502 assembler, disassembler and linker

Commit MetaInfo

• Revision: ae0889a7d762f5235290c665d15a558cf5352c3b (tree)
• Time: 2013-02-08 12:06:08
• Author: astoria-d <astoria-d@my-s...>
• Commiter: astoria-d

Log Message

segment sort supported

Change Summary

• modified: include/tools.h
• modified: libs/tools.c
• modified: linker/linker.c
• modified: linker/linkmap
• modified: linker/lmap.c
• modified: linker/nesln-main.c

Incremental Difference

--- a/include/tools.h
+++ b/include/tools.h
@@ -18,6 +18,7 @@ int slist_count (struct slist* head);
 
 void dlist_init (struct dlist* node) ;
 void dlist_add_next (struct dlist* dest, struct dlist* node) ;
+void dlist_add_prev (struct dlist* dest, struct dlist* node) ;
 int dlist_remove (struct dlist* node) ;
 int dlist_count (struct dlist* head);
 

--- a/libs/tools.c
+++ b/libs/tools.c
@@ -45,6 +45,17 @@ void dlist_add_next (struct dlist* dest, struct dlist* node) {
     node->next = next_node;
 }
 
+void dlist_add_prev (struct dlist* dest, struct dlist* node) {
+    struct dlist* prev_node = dest->prev;
+
+    if (prev_node) {
+        prev_node->next = node;
+    }
+    dest->prev = node;
+    node->prev = prev_node;
+    node->next = dest;
+}
+
 void dlist_add_tail (struct dlist* dest, struct dlist* node) {
     struct dlist* next_node = dest->next;
     struct dlist* tail_node = dest;

--- a/linker/linker.c
+++ b/linker/linker.c
@@ -5,8 +5,12 @@
 #include "obj-format.h"
 #include "segment.h"
 
+#define DEFAULT_SEGMENT     "<default>"
+
 static struct seginfo* seg_list;
 
+int lookup_lmap(const char* segname, unsigned short *start, unsigned short *size);
+
 static void clear_seglist(struct seginfo* sg_head) {
     struct seginfo* pseg;
 
@@ -16,7 +20,7 @@ static void clear_seglist(struct seginfo* sg_head) {
     } * closed_list = NULL;
     struct closed_file *wk_list;
 
-    dprint("clear_seglist.\n");
+    //dprint("clear_seglist.\n");
     pseg = sg_head;
     while (pseg != NULL) {
         struct seginfo* pp = pseg;
@@ -41,7 +45,7 @@ static void clear_seglist(struct seginfo* sg_head) {
             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);
+            //dprint("file close %s\n", pp->out_fname);
             fclose(pp->fp);
         }
         else {
@@ -59,7 +63,7 @@ static void clear_seglist(struct seginfo* sg_head) {
                 cl->l.next = NULL;
                 cl->fp = pp->fp;
                 slist_add_tail(&closed_list->l, &cl->l);
-                dprint("file close %s\n", pp->out_fname);
+                //dprint("file close %s\n", pp->out_fname);
                 fclose(pp->fp);
             }
         }
@@ -79,19 +83,33 @@ static void clear_seglist(struct seginfo* sg_head) {
 
 
 static struct seginfo * segh2segi (struct seghdr *sgh, FILE* objfile, const char* fname) {
-
     struct seginfo * pseg = malloc (sizeof(struct seginfo));
+    unsigned short start, size;
+    int ret;
 
-    dprint("segment: %s\n", sgh->seg_name);
     dlist_init (&pseg->list);
-    pseg->name = strdup(sgh->seg_name);
+
+    if (sgh->seg_name[0] == '\0')
+        pseg->name = strdup(DEFAULT_SEGMENT);
+    else
+        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;
+    ///current pc is set to segment start address.
+    ret = lookup_lmap(pseg->name, &start, &size);
+    if (!ret) {
+        fprintf(stderr, "invalid segment [%s]\n", pseg->name);
+        free (pseg->name);
+        free (pseg);
+        return NULL;
+    }
+    pseg->current_pc = start;
     pseg->segsize = sgh->seg_data_size;
 
     pseg->out_fname = strdup(fname);
@@ -100,11 +118,45 @@ static struct seginfo * segh2segi (struct seghdr *sgh, FILE* objfile, const char
     return pseg;
 }
 
+static int add_segment_list(struct seginfo *pseg) {
+    if (seg_list == NULL)
+        seg_list  = pseg;
+    else 
+    {
+        int ret;
+        unsigned short start, size;
+        struct seginfo* node;
+
+        ret = lookup_lmap(pseg->name, &start, &size);
+        if (!ret) {
+            fprintf(stderr, "invalid segment [%s]\n", pseg->name);
+            return FALSE;
+        }
+
+        node = seg_list;
+        while(node != NULL) {
+            //now current_pc is pointing at the segment start address.
+            if (node->current_pc > start) {
+                break;
+            }
+            node = (struct seginfo*) node->list.next;
+        }
+
+        //sort segment by the start address
+        if (node)
+            dlist_add_prev(&node->list, &pseg->list);
+        else
+            dlist_add_tail(&seg_list->list, &pseg->list);
+    }
+    return TRUE;
+}
+
 int load_object (const char* obj_fname) {
     FILE* fp;
     struct molfhdr* molh;
     int segh_start;
     int i, seg_cnt;
+    int ret;
 
     fp=fopen(obj_fname, "r");
     if (fp == NULL) {
@@ -139,10 +191,15 @@ int load_object (const char* obj_fname) {
         }
 
         pseg = segh2segi(sgh, fp, obj_fname);
-        if (seg_list == NULL)
-            seg_list  = pseg;
-        else 
-            dlist_add_tail(&seg_list->list, &pseg->list);
+        if (!pseg) {
+            clear_segh(sgh);
+            return FALSE;
+        }
+        ret = add_segment_list(pseg);
+        if (!ret) {
+            clear_segh(sgh);
+            return FALSE;
+        }
         
         //segh_start += sgh->seg_data_size;
 
@@ -152,10 +209,6 @@ int load_object (const char* obj_fname) {
     return TRUE;
 }
 
-int sort_segment(void) {
-    return TRUE;
-}
-
 int link_segment(const char* out_name) {
     return TRUE;
 }

--- a/linker/linkmap
+++ b/linker/linkmap
@@ -3,4 +3,4 @@ HEADER          0x0000          0x0010
 STARTUP         0x8000          0x1000
 VECINFO         0xfffa          0x0006
 CHARS           0x0000          0x2000
-
+<default>       0x8000          0x1000

--- a/linker/lmap.c
+++ b/linker/lmap.c
@@ -14,6 +14,24 @@ struct lmap_entry {
 
 static struct lmap_entry * lmap_list;
 
+
+int lookup_lmap(const char* segname, unsigned short *start, unsigned short *size) {
+    struct lmap_entry *lm;
+    //dprint("lookup_lmap %s\n", segname);
+
+    lm = lmap_list;
+    while (lm != NULL) {
+        //dprint(">>: %s\n", lm->seg_name);
+        if (!strcmp(segname, lm->seg_name)) {
+            *start = lm->start;
+            *size = lm->size;
+            return TRUE;
+        }
+        lm = (struct lmap_entry*)lm->list.next;
+    }
+    return FALSE;
+}
+
 int load_lmap(const char* fname) {
     FILE* fp;
     char ch;
@@ -72,12 +90,12 @@ int load_lmap(const char* fname) {
             free (buf);
             return FALSE;
         }
-        dprint("seg: %s %04x, %04x\n", seg_name, start, size);
+        //dprint("seg: %s %04x, %04x\n", seg_name, start, size);
 
         //free (buf);
         lm = malloc(sizeof(struct lmap_entry));
         dlist_init(&lm->list);
-        lm->seg_name = buf;
+        lm->seg_name = strdup(seg_name);
         lm->start = start;
         lm->size = size;
 

--- a/linker/nesln-main.c
+++ b/linker/nesln-main.c
@@ -128,13 +128,13 @@ int main (int argc, char** argv) {
     }
 
     //linker main work here.
-    sort_segment();
     ret = link_segment(out_fname);
     if (!ret) {
         fprintf(stderr, "link error...\n");
         goto done;
     }
 
+    dprint("link succeeded\n");
     ret = RT_OK;
 
 done: