Get things working again, with LMA addresses specified.

trhodeos · trhodeos · commit a186443fc3bb · 2018-04-11T11:19:50.000-07:00
Note that this temporary breaks 'after' statements. Need to work on
ordering.
diff --git a/ld.go b/ld.go
@@ -18,20 +18,21 @@ func createLdScript(w *Wave) (io.Reader, error) {
 	t := `
 ENTRY(_start)
 MEMORY {
-    ram (RX) : ORIGIN = 0xFFFFFFFF80000000, LENGTH = 0x7FFFFFFF
+    ram (RX) : ORIGIN = 0x80000000, LENGTH = 0x7FFFFFFF
+    ram.bss (RW) : ORIGIN = 0x80000000, LENGTH = 0x7FFFFFFF
 }
 SECTIONS {
     _RomStart = 0x1000;
     _RomSize = _RomStart;
-    ..generatedStartEntry 0xFFFFFFFF80000400 : AT(_RomSize)
+    ..generatedStartEntry 0x80000400 : AT(_RomSize)
     {
       a.out (.text)
       a.out (.bss)
       a.out (.data)
     } > ram
     {{range .ObjectSegments -}}
-      {{if not (eq .Positioning.Address 0)}}
-        _RomSize = {{.Positioning.Address}} - 0xFFFFFFFF80000400 + _RomStart;
+      {{if (gt .Positioning.Address 0x80000400)}}
+        _RomSize = ({{.Positioning.Address}} - 0x80000400) + _RomStart;
       {{end}}
     _{{.Name}}SegmentRomStart = _RomSize;
     ..{{.Name}}
@@ -70,10 +71,10 @@ SECTIONS {
       . = ALIGN(0x10);
       _{{.Name}}SegmentDataEnd = .;
     } > ram
-    _RomSize += _{{.Name}}SegmentDataEnd - _{{.Name}}SegmentTextStart;
+    _RomSize += (_{{.Name}}SegmentDataEnd - _{{.Name}}SegmentTextStart);
     _{{.Name}}SegmentRomEnd = _RomSize;
 
-    ..{{.Name}}.bss ADDR(..{{.Name}}) + SIZEOF(..{{.Name}}) (NOLOAD) : AT(_RomSize)
+    ..{{.Name}}.bss ADDR(..{{.Name}}) + SIZEOF(..{{.Name}}) (NOLOAD) :
     {
       . = ALIGN(0x10);
       _{{.Name}}SegmentBssStart = .;
@@ -92,7 +93,7 @@ SECTIONS {
       . = ALIGN(0x10);
       _{{.Name}}SegmentBssEnd = .;
       _{{.Name}}SegmentEnd = .;
-    } > ram
+    } > ram.bss
     _{{.Name}}SegmentBssSize =  _{{.Name}}SegmentBssEnd - _{{.Name}}SegmentBssStart;
   {{ end }}
   {{range .RawSegments -}}
diff --git a/spec.go b/spec.go
@@ -130,7 +130,7 @@ func convertSegmentAst(s *SegmentAst) (*Segment, error) {
 			seg.Name = statement.Value.String
 			break
 		case "address":
-			seg.Positioning.Address = SignExtend(statement.Value.Int)
+			seg.Positioning.Address = statement.Value.Int
 			break
 		case "after":
 			if statement.Value.String != "" {
@@ -168,6 +168,7 @@ func convertSegmentAst(s *SegmentAst) (*Segment, error) {
 			}
 			break
 		case "number":
+			seg.Positioning.Address = statement.Value.Int * 0x1000000
 			// Don't do anything, as we don't really care here.
 			// All that matters for code is the rom address.
 			break
@@ -217,7 +218,7 @@ func convertWaveAst(s *WaveAst, segments map[string]*Segment) (*Wave, error) {
 func (w *Wave) updateWithConstants() {
 	for _, seg := range w.ObjectSegments {
 		if seg.Flags.Boot && seg.Positioning.Address == 0 {
-			seg.Positioning.Address = SignExtend(0x80000450)
+			seg.Positioning.Address = 0x80000450
 		}
 	}
 }
@@ -333,7 +334,7 @@ func (w *Wave) correctOrdering() {
 	// TODO(trhodeos): Make this actually correct. This just places any
 	// explicitly addressed segments before any 'after.*' segments. If
 	// 'after' segments depend on other 'after' segments, this'll break.
-	l := list.New()
+	/*l := list.New()
 	for _, seg := range w.ObjectSegments {
 		if seg.Positioning.Address != 0 {
 			l.PushBack(seg)
@@ -356,6 +357,7 @@ func (w *Wave) correctOrdering() {
 		newSegments = append(newSegments, original)
 	}
 	w.ObjectSegments = newSegments
+	*/
 }
 
 func (w *Wave) GetBootSegment() *Segment {
