Commit: 353aaf3498160ede02bcb630d3c47755d83cfbd8 - motonesas (git)

MOT6502 assembler, disassembler and linker

Commit MetaInfo

• Revisión: 353aaf3498160ede02bcb630d3c47755d83cfbd8 (tree)
• Tiempo: 2013-02-07 18:40:09
• Autor: astoria-d <astoria-d@my-s...>
• Commiter: astoria-d

Log Message

simple linker script support

Cambiar Resumen

• modified: linker/Makefile
• modified: linker/linker.c
• add: linker/linkmap
• add: linker/lmap.c
• modified: linker/nesln-main.c

Diferencia incremental

--- a/linker/Makefile
+++ b/linker/Makefile
@@ -1,7 +1,7 @@
 
 BIN=motonesln
 
-OBJS=nesln-main.o linker.o
+OBJS=nesln-main.o linker.o lmap.o
 
 
 LIBS=-L../libs -lmotones

--- a/linker/linker.c
+++ b/linker/linker.c
@@ -52,7 +52,7 @@ static void clear_seglist(struct seginfo* sg_head) {
                     closed = TRUE;
                     break;
                 }
-                cl = cl->l.next;
+                cl = (struct closed_file*)cl->l.next;
             }
             if (!closed) {
                 cl = malloc (sizeof(struct closed_file));
@@ -72,13 +72,13 @@ static void clear_seglist(struct seginfo* sg_head) {
     wk_list = closed_list;
     while (wk_list != NULL) {
         struct closed_file *pp = wk_list;
-        wk_list = wk_list->l.next;
+        wk_list = (struct closed_file*)wk_list->l.next;
         free(pp);
     }
 }
 
 
-struct seginfo * segh2segi (struct seghdr *sgh, FILE* objfile, const char* fname) {
+static struct seginfo * segh2segi (struct seghdr *sgh, FILE* objfile, const char* fname) {
 
     struct seginfo * pseg = malloc (sizeof(struct seginfo));
 
@@ -152,6 +152,14 @@ int load_object (const char* obj_fname) {
     return TRUE;
 }
 
+int sort_segment(void) {
+    return TRUE;
+}
+
+int link_segment(const char* out_name) {
+    return TRUE;
+}
+
 void destroy_linker(void) {
     if (seg_list)
         clear_seglist (seg_list);

--- /dev/null
+++ b/linker/linkmap
@@ -0,0 +1,6 @@
+#segment name,  start address,  size
+HEADER          0x0000          0x0010 
+STARTUP         0x8000          0x1000
+VECINFO         0xfffa          0x0006
+CHARS           0x0000          0x2000
+

--- /dev/null
+++ b/linker/lmap.c
@@ -0,0 +1,118 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "tools.h"
+
+#define BUF_SIZE 100
+
+struct lmap_entry {
+    struct dlist list;
+    char* seg_name;
+    unsigned short start;
+    unsigned short size;
+};
+
+static struct lmap_entry * lmap_list;
+
+int load_lmap(const char* fname) {
+    FILE* fp;
+    char ch;
+    char seg_name [100];
+    int start, size;
+    int scan_cnt;
+    char* buf;
+
+    fp = fopen (fname, "r");
+    if (fp == NULL)
+        return FALSE;
+
+
+    while ( fread(&ch, 1, 1, fp) > 0 ){
+        struct lmap_entry* lm;
+        //read line by line.
+        if (ch == '#') {
+            while ( fread(&ch, 1, 1, fp) > 0 ){
+                if (ch == '\n')
+                    break;
+            }
+            continue;
+        }
+        else {
+            int buf_cnt = 1;
+            int i = 0;
+            int size = BUF_SIZE;
+
+            buf = malloc (size);
+            buf [i++] = ch;
+            //dprint("%c\n", ch);
+            while ( fread(&ch, 1, 1, fp) > 0 ){
+                if (i == BUF_SIZE * buf_cnt) {
+                    //dprint("realloc: %d\n", BUF_SIZE * buf_cnt);
+                    buf = realloc(buf, BUF_SIZE * ++buf_cnt);
+                }
+                if (ch == '\n') {
+                    buf [i] = '\0';
+                    break;
+                }
+                //dprint("%c\n", ch);
+                buf [i++] = ch;
+            }
+            buf [i] = '\0';
+            //dprint("buf: %s\n", buf);
+        }
+
+        //skip blank line 
+        if (*buf == '\n') {
+            free(buf);
+            continue;
+        }
+
+        scan_cnt = sscanf(buf, "%s %x %x", seg_name, &start, &size);
+        if (scan_cnt != 3) {
+            free (buf);
+            return FALSE;
+        }
+        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->start = start;
+        lm->size = size;
+
+        if (!lmap_list) {
+            lmap_list = lm;
+        }
+        else {
+            dlist_add_tail(lmap_list, lm);
+        }
+    }
+
+    return TRUE;
+}
+
+static void clear_lmap(void) {
+    struct lmap_entry *lm;
+    lm = lmap_list;
+    while (lm != NULL) {
+        struct lmap_entry *pp;
+
+        pp = lm;
+        lm = (struct lmap_entry*)lm->list.next;
+        dlist_remove(&pp->list);
+        free(pp->seg_name);
+        free(pp);
+    }
+
+}
+
+int init_lmap(void) {
+    lmap_list = NULL;
+    return TRUE;
+}
+
+void destory_lmap(void) {
+    clear_lmap();
+}
+

--- a/linker/nesln-main.c
+++ b/linker/nesln-main.c
@@ -8,7 +8,10 @@
 int init_linker(void);
 void destroy_linker(void);
 
-static char* out_fname = NULL;
+int sort_segment(void);
+int link_segment(const char* out_name);
+int init_lmap(void);
+void destory_lmap(void);
 
 int init_datas(void) {
     int ret;
@@ -18,15 +21,21 @@ int init_datas(void) {
         fprintf(stderr, "linker initalization failed...\n");
         return FALSE;
     }
+    ret = init_lmap();
+    if (!ret) {
+        fprintf(stderr, "linker config init failed...\n");
+        return FALSE;
+    }
     return TRUE;
 }
 
 void destroy_datas(void) {
     destroy_linker();
+    destory_lmap();
 }
 
 void print_usage(void) {
-    printf("motonesln [option...] [.o files]\n");
+    printf("motonesln -l linkmap [option...] [.o files]\n");
     printf("Options:\n");
     printf("\t-h: print this page.\n");
     printf("\t-o [output]: output object file.\n");
@@ -38,11 +47,16 @@ int main (int argc, char** argv) {
     extern int optind;
     int need_free_out = FALSE;
     int i;
+    char* out_fname = NULL;
+    char* lmap_fname = NULL;
 
     dprint("main...\n");
 
-    while( (ch = getopt(argc, argv, "ho:")) != -1) {
+    while( (ch = getopt(argc, argv, "ho:l:")) != -1) {
         switch (ch) {
+            case 'l':
+                lmap_fname = optarg;
+                break;
             case 'o':
                 out_fname = optarg;
                 break;
@@ -62,11 +76,17 @@ int main (int argc, char** argv) {
         return RT_ERROR;
     }
 
-    if (argc == 1) {
+    if (argc == 1 || lmap_fname == NULL) {
         print_usage();
         return RT_ERROR;
     }
 
+    ret = load_lmap(lmap_fname);
+    if (!ret) {
+        fprintf(stderr, "link map load error...\n");
+        return RT_ERROR;
+    }
+
     if (out_fname == NULL && argc == 2) {
         const char* in_fname = argv[1];
         char *p, *pp;
@@ -102,10 +122,17 @@ int main (int argc, char** argv) {
 
         ret = load_object(fname);
         if (!ret) {
-            fprintf(stderr, "link error...\n");
+            fprintf(stderr, "load object error...\n");
             goto done;
         }
+    }
 
+    //linker main work here.
+    sort_segment();
+    ret = link_segment(out_fname);
+    if (!ret) {
+        fprintf(stderr, "link error...\n");
+        goto done;
     }
 
     ret = RT_OK;
@@ -120,7 +147,3 @@ done:
     return RT_ERROR;
 }
 
-const char* get_out_fname(void) {
-    return out_fname;
-}
-