refactor: move disassembler to debug pkg

cli/cli.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"os"
 
+	"github.com/gaoliveira21/chip8/cli/debug"
 	"github.com/gaoliveira21/chip8/core"
 )
 
@@ -14,6 +15,8 @@ func main() {
 
 	romData, err := os.ReadFile(*rom)
 
+	go debug.NewDebugger(romData, *rom)
+
 	if err != nil {
 		log.Fatal(err)
 	}

cli/debug/debugger.go

@@ -0,0 +1,18 @@
+package debug
+
+import (
+	"fmt"
+)
+
+type DisassemblerResponse struct {
+	Instructions []string `json:"instructions"`
+	RomName      string   `json:"romName"`
+}
+
+func NewDebugger(rom []byte, romName string) {
+	instructions := Disassemble(rom)
+
+	for _, v := range instructions {
+		fmt.Print(v)
+	}
+}

cli/debug/disassembler.go

@@ -0,0 +1,140 @@
+package debug
+
+import (
+	"fmt"
+
+	"github.com/gaoliveira21/chip8/core/cpu"
+)
+
+func Disassemble(bytes []byte) []string {
+	instructions := []string{}
+
+	for i := 0; i < len(bytes); i += 2 {
+		hb := uint16(bytes[i])
+		lb := uint16(bytes[i+1])
+
+		instruction := (hb << 8) | lb
+
+		opcode := cpu.NewOpcode(instruction)
+
+		switch opcode.Instruction {
+		case 0x0000:
+			if opcode.RegisterY == 0xC {
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 00CN (SCROLL-DOWN N)\n", instruction))
+				continue
+			}
+
+			switch opcode.NNN {
+			case 0x0E0:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 00E0 CLS\n", instruction))
+
+			case 0x0EE:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 00EE RET\n", instruction))
+
+			case 0x0FE:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 00FE (LORES)\n", instruction))
+
+			case 0x0FF:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 00FF (HIRES)\n", instruction))
+
+			case 0x0FB:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 00FB (SCROLL-RIGHT)\n", instruction))
+
+			case 0x0FC:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 00FC (SCROLL-LEFT)\n", instruction))
+
+			case 0x0FD:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 00FD (EXIT)\n", instruction))
+
+			default:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 0NNN JP addr\n", instruction))
+			}
+		case 0x1000:
+			instructions = append(instructions, fmt.Sprintf("0x%.4X - 1NNN JP addr\n", instruction))
+		case 0x2000:
+			instructions = append(instructions, fmt.Sprintf("0x%.4X - 2NNN CALL addr\n", instruction))
+		case 0x3000:
+			instructions = append(instructions, fmt.Sprintf("0x%.4X - 3XKK SE Vx, byte\n", instruction))
+		case 0x4000:
+			instructions = append(instructions, fmt.Sprintf("0x%.4X - 4XKK SNE Vx, byte\n", instruction))
+		case 0x5000:
+			instructions = append(instructions, fmt.Sprintf("0x%.4X - 5XY0 SE Vx, Vy\n", instruction))
+		case 0x6000:
+			instructions = append(instructions, fmt.Sprintf("0x%.4X - 6XKK LD Vx, byte\n", instruction))
+		case 0x7000:
+			instructions = append(instructions, fmt.Sprintf("0x%.4X - 7XKK ADD Vx, byte\n", instruction))
+		case 0x8000:
+			switch opcode.N {
+			case 0x0:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 8XY0 LD Vx, Vy\n", instruction))
+			case 0x1:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 8XY1 OR Vx, Vy\n", instruction))
+			case 0x2:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 8XY2 AND Vx, Vy\n", instruction))
+			case 0x3:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 8XY3 XOR Vx, Vy\n", instruction))
+			case 0x4:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 8XY4 ADD Vx, Vy\n", instruction))
+			case 0x5:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 8XY5 SUB Vx, Vy\n", instruction))
+			case 0x6:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 8XY6 SHR Vx {, Vy}\n", instruction))
+			case 0x7:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 8XY7 SUBN Vx, Vy\n", instruction))
+			case 0xE:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - 8XYE SHL Vx {, Vy}\n", instruction))
+			}
+		case 0x9000:
+			instructions = append(instructions, fmt.Sprintf("0x%.4X - 9XY0 SNE Vx, Vy\n", instruction))
+		case 0xA000:
+			instructions = append(instructions, fmt.Sprintf("0x%.4X - ANNN LD I, addr\n", instruction))
+		case 0xB000:
+			instructions = append(instructions, fmt.Sprintf("0x%.4X - BNNN JP V0, addr\n", instruction))
+		case 0xC000:
+			instructions = append(instructions, fmt.Sprintf("0x%.4X - CXKK RND Vx, byte\n", instruction))
+		case 0xD000:
+			switch opcode.N {
+			case 0x0:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - DXY0 (SPRITE Vx Vy 0)\n", instruction))
+			default:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - DXYN DRW Vx, Vy, nibble\n", instruction))
+			}
+		case 0xE000:
+			switch opcode.NN {
+			case 0x9E:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - EX9E SKP Vx\n", instruction))
+			case 0xA1:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - EXA1 SKNP Vx\n", instruction))
+			}
+		case 0xF000:
+			switch opcode.NN {
+			case 0x07:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX07 LD Vx, DT\n", instruction))
+			case 0x15:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX15 LD DT, Vx\n", instruction))
+			case 0x18:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX18 LD ST, Vx\n", instruction))
+			case 0x0A:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX0A LD Vx, K\n", instruction))
+			case 0x1E:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX1E ADD I, Vx\n", instruction))
+			case 0x29:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX29 LD F, Vx\n", instruction))
+			case 0x30:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX30 (i := BIGHEX Vx)\n", instruction))
+			case 0x33:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX33 LD B, Vx\n", instruction))
+			case 0x55:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX55 LD [I], Vx\n", instruction))
+			case 0x65:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX65 LD Vx, [I]\n", instruction))
+			case 0x75:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX75 (SAVE FLAGS Vx)\n", instruction))
+			case 0x85:
+				instructions = append(instructions, fmt.Sprintf("0x%.4X - FX85 (LOAD FLAGS Vx)\n", instruction))
+			}
+		}
+	}
+
+	return instructions
+}

core/chip8.go

@@ -61,8 +61,6 @@ func (c8 *Chip8) Layout(outsideWidth, outsideHeight int) (screenWidth, screenHei
 }
 
 func RunChip8(rom []byte, title string) {
-	Disassemble(rom)
-
 	c := cpu.NewCpu()
 	c.LoadROM(rom)