Use the word body address rather than the word address. Helps with optimizations.

Author: Molorius

pkg/forth/cell.go

@@ -167,6 +167,10 @@ func (c CellLiteral) AddToList(u *Ulp) error {
 	if err != nil {
 		return err
 	}
+	_, ok := c.cell.(CellAddress)
+	if ok {
+		ref = "__body" + ref
+	}
 	litref := c.reference(ref)
 	u.literals[litref] = ref
 	cellAddress, ok := c.cell.(CellAddress)
@@ -185,6 +189,10 @@ func (c CellLiteral) BuildExecution(u *Ulp) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	_, ok := c.cell.(CellAddress)
+	if ok {
+		name = "__body" + name
+	}
 	switch u.compileTarget {
 	case UlpCompileTargetToken:
 		ref := c.reference(name)
@@ -356,10 +364,10 @@ func (c *CellTailCall) AddToList(u *Ulp) error {
 func (c *CellTailCall) BuildExecution(u *Ulp) (string, error) {
 	switch u.compileTarget {
 	case UlpCompileTargetToken:
-		return fmt.Sprintf(".int %s + 0x8000", c.dest.Entry.ulpName), nil
+		return fmt.Sprintf(".int %s + 0x8000", c.dest.Entry.BodyLabel()), nil
 	case UlpCompileTargetSubroutine:
 		// put the address after the docol
-		return fmt.Sprintf("move r2, %s + 1\r\njump r2", c.dest.Entry.ulpName), nil
+		return fmt.Sprintf("move r2, %s\r\njump r2", c.dest.Entry.BodyLabel()), nil
 	default:
 		return "", fmt.Errorf("Unknown compile target %d, please file a bug report", u.compileTarget)
 	}

pkg/forth/dictionary.go

@@ -37,6 +37,10 @@ func (d *DictionaryEntry) ClearVisited() {
 	d.Flag.visited = false
 }
 
+func (d *DictionaryEntry) BodyLabel() string {
+	return "__body" + d.ulpName
+}
+
 // The Forth Dictionary. This architecture uses individual entries
 // representing words rather than a flat cell structure.
 type Dictionary struct {

pkg/forth/primitive.go

@@ -592,7 +592,7 @@ func PrimitiveSetup(vm *VirtualMachine) error {
 					"st r2, r1, 0",   // store return address
 					"move r2, __rsp", // put pointer on rsp
 					"st r1, r2, 0",   // store rsp
-					"add r2, r0, 1",  // go past the docol
+					"move r2, r0",    // put address into instruction pointer
 					"jump r2",        // jump to the forth word, past the docol
 				},
 				NonStandardNext: true,
@@ -761,9 +761,9 @@ func PrimitiveSetup(vm *VirtualMachine) error {
 			ulpAsmSrt: PrimitiveUlpSrt{
 				Asm: []string{
 					"ld r0, r3, 0",  // get the address from stack
-					"ld r0, r0, 1",  // get the body address in the move instruction
-					"rsh r0, r0, 4", // shift it into the correct space
-					"st r0, r3, 0",  // store the body address on stack
+					"ld r0, r0, 0",  // get the move instruction
+					"rsh r0, r0, 4", // shift the address into the correct space
+					"st r0, r3, 0",  // store the address on stack
 				},
 			},
 		},

pkg/forth/word.go

@@ -113,13 +113,20 @@ func (w *WordForth) AddToList(u *Ulp) error {
 
 func (w *WordForth) BuildAssembly(u *Ulp) (string, error) {
 	output := make([]string, 1)
-	output[0] = w.Entry.ulpName + ":"
+	label := w.Entry.ulpName + ":"
+	bodyLabel := w.Entry.BodyLabel() + ":"
+	output[0] = label
 	if w.Entry.Flag.Data { // data word
+		output = append(output, bodyLabel)
 		for _, cell := range w.Cells {
 			ref, err := cell.OutputReference(u)
 			if err != nil {
 				return "", err
 			}
+			_, ok := cell.(CellAddress)
+			if ok {
+				ref = "__body" + ref
+			}
 			val := ".int " + ref
 			output = append(output, val)
 		}
@@ -129,6 +136,7 @@ func (w *WordForth) BuildAssembly(u *Ulp) (string, error) {
 				output = append(output, "jump __docol")
 			}
 		}
+		output = append(output, bodyLabel)
 		for _, cell := range w.Cells {
 			asm, err := cell.BuildExecution(u)
 			if err != nil {
@@ -207,7 +215,8 @@ func (w *WordPrimitive) AddToList(u *Ulp) error {
 }
 
 func (w *WordPrimitive) BuildAssembly(u *Ulp) (string, error) {
-	out := w.Entry.ulpName + ":" + "\r\n"
+	label := w.Entry.ulpName + ":\r\n"
+	bodyLabel := w.Entry.BodyLabel() + ":\r\n"
 	asm := make([]string, 0)
 	switch u.compileTarget {
 	case UlpCompileTargetToken:
@@ -235,7 +244,8 @@ func (w *WordPrimitive) BuildAssembly(u *Ulp) (string, error) {
 	default:
 		return "", fmt.Errorf("Unknown compile target %d, please file a bug report", u.compileTarget)
 	}
-	out += strings.Join(asm, "\r\n")
+	asmStr := strings.Join(asm, "\r\n")
+	out := label + bodyLabel + asmStr
 	return out, nil
 }