aboutsummaryrefslogtreecommitdiff
path: root/parse.go
diff options
context:
space:
mode:
Diffstat (limited to 'parse.go')
-rw-r--r--parse.go33
1 files changed, 20 insertions, 13 deletions
diff --git a/parse.go b/parse.go
index 336ce5a..bf96844 100644
--- a/parse.go
+++ b/parse.go
@@ -11,7 +11,7 @@ func Decode(v uint16) Instruction {
return newJump(v)
case v&(7<<13) == 1<<13:
return newCond(v)
- case v&(7<<13) == 1<<14:
+ case v&(7<<13) == 2<<13:
return newCall(v)
case v&(7<<13) == 3<<13:
return newALU(v)
@@ -23,35 +23,40 @@ func Decode(v uint16) Instruction {
type Instruction interface {
String() string
Value() uint16
+ Compile() uint16
}
// Lit is a literal
type Lit uint16
-func newLit(v uint16) Lit { return Lit(v &^ uint16(1<<15)) }
-func (v Lit) String() string { return fmt.Sprintf("LIT %0.4X", uint16(v)) }
-func (v Lit) Value() uint16 { return uint16(v) }
+func newLit(v uint16) Lit { return Lit(v &^ uint16(1<<15)) }
+func (v Lit) String() string { return fmt.Sprintf("LIT %0.4X", uint16(v)) }
+func (v Lit) Value() uint16 { return uint16(v) }
+func (v Lit) Compile() uint16 { return v.Value() | (1 << 15) }
// Jump is an unconditional branch
type Jump uint16
-func newJump(v uint16) Jump { return Jump(v &^ uint16(7<<13)) }
-func (v Jump) String() string { return fmt.Sprintf("UBRANCH %0.4X", uint16(v<<1)) }
-func (v Jump) Value() uint16 { return uint16(v) }
+func newJump(v uint16) Jump { return Jump(v &^ uint16(7<<13)) }
+func (v Jump) String() string { return fmt.Sprintf("UBRANCH %0.4X", uint16(v<<1)) }
+func (v Jump) Value() uint16 { return uint16(v) }
+func (v Jump) Compile() uint16 { return v.Value() }
// Cond is a conditional branch
type Cond uint16
-func newCond(v uint16) Cond { return Cond(v &^ uint16(7<<13)) }
-func (v Cond) String() string { return fmt.Sprintf("0BRANCH %0.4X", uint16(v<<1)) }
-func (v Cond) Value() uint16 { return uint16(v) }
+func newCond(v uint16) Cond { return Cond(v &^ uint16(7<<13)) }
+func (v Cond) String() string { return fmt.Sprintf("0BRANCH %0.4X", uint16(v<<1)) }
+func (v Cond) Value() uint16 { return uint16(v) }
+func (v Cond) Compile() uint16 { return v.Value() | (1 << 13) }
// Call procedure
type Call uint16
-func newCall(v uint16) Call { return Call(v &^ uint16(7<<13)) }
-func (v Call) String() string { return fmt.Sprintf("CALL %0.4X", uint16(v<<1)) }
-func (v Call) Value() uint16 { return uint16(v) }
+func newCall(v uint16) Call { return Call(v &^ uint16(7<<13)) }
+func (v Call) String() string { return fmt.Sprintf("CALL %0.4X", uint16(v<<1)) }
+func (v Call) Value() uint16 { return uint16(v) }
+func (v Call) Compile() uint16 { return v.Value() | (2 << 13) }
// ALU instruction
type ALU struct {
@@ -95,6 +100,8 @@ func (v ALU) Value() uint16 {
return ret
}
+func (v ALU) Compile() uint16 { return v.Value() | (3 << 13) }
+
func expand(v uint16) int8 {
if v&2 != 0 {
v |= 0xfc