Split object segments and raw segments.

ld.go

@@ -13,15 +13,15 @@ import (
 func createLdScript(w *Wave) (string, error) {
 	t := `
 MEMORY {
-    {{range .Segments}}
+    {{range .ObjectSegments}}
     {{.Name}}.RAM (RX) : ORIGIN = {{.Positioning.Address}}, LENGTH = 0x400000
     {{.Name}}.bss.RAM (RW) : ORIGIN = {{.Positioning.Address}}, LENGTH = 0x400000
     {{end}}
 }
 SECTIONS {
     _RomSize = 0x1050;
     _RomStart = _RomSize;
-  {{range .Segments -}}
+  {{range .ObjectSegments -}}
     _{{.Name}}SegmentRomStart = _RomSize;
     ..{{.Name}} {{.Positioning.Address}}:
     {

spec.go

@@ -112,7 +112,8 @@ type Segment struct {
 
 type Wave struct {
 	Name     string
-	Segments []*Segment
+	ObjectSegments []*Segment
+	RawSegments []*Segment
 }
 
 type Spec struct {
@@ -197,7 +198,11 @@ func convertWaveAst(s *WaveAst, segments map[string]*Segment) (*Wave, error) {
 			break
 		case "include":
 			seg := segments[statement.Value.String]
-			out.Segments = append(out.Segments, seg)
+                        if seg.Flags.Object {
+                          out.ObjectSegments = append(out.ObjectSegments, seg)
+                        } else if seg.Flags.Raw {
+                          out.RawSegments = append(out.RawSegments, seg)
+                        }
 			break
 		default:
 			return nil, errors.New(fmt.Sprintf("Unknown name %s", statement.Name))
@@ -207,7 +212,7 @@ func convertWaveAst(s *WaveAst, segments map[string]*Segment) (*Wave, error) {
 }
 
 func (w *Wave) updateWithConstants() {
-  for _, seg := range(w.Segments) {
+  for _, seg := range(w.ObjectSegments) {
     if (seg.Flags.Boot) {
       seg.Positioning.Address = 0x80000450
     }
@@ -255,7 +260,7 @@ func ParseSpec(r io.Reader) (*Spec, error) {
 }
 
 func (w *Wave) checkValidity() error {
-              for _, seg := range w.Segments {
+              for _, seg := range w.ObjectSegments {
                       numSet := 0
                       if seg.Name == "" {
                               return errors.New("Name must be non-empty.")
@@ -288,7 +293,7 @@ func (w *Wave) checkValidity() error {
 }
 
 func (w *Wave) GetBootSegment() *Segment {
-	for _, seg := range w.Segments {
+	for _, seg := range w.ObjectSegments {
 		if seg.Flags.Boot {
 			return seg
 		}