move InstructionSet and Op to asm package

client/src/machine/Thread.ts

@@ -1,6 +1,6 @@
 import {Disassembler} from "./asm/Disassembler";
 import {Addr, Endian} from "./core.ts";
-import {OpSemantics} from "./Op.ts";
+import {OpSemantics} from "./asm/Op.ts";
 import {Memory} from "./Memory.ts";
 
 /**

client/src/machine/asm/Assembler.ts

@@ -2,7 +2,7 @@ import {Addr} from "../core.ts";
 import {Dialect} from "./Dialect.ts";
 import {InstructionLike} from "./instructions.ts";
 import {ParserState} from "./DefaultDialect.ts";
-import {InstructionSet} from "../InstructionSet.ts";
+import {InstructionSet} from "./InstructionSet.ts";
 
 /**
  * Syntax-independent stateful assembler, parametised by {@link InstructionSet}

client/src/machine/asm/Disassembler.ts

@@ -5,9 +5,9 @@ import {ByteDeclaration, Edict, FullInstructionLine, InstructionLike, SymDef} fr
 import * as R from "ramda";
 import {LabelsComments} from "./asm.ts";
 import {DisassemblyMeta} from "./DisassemblyMeta.ts";
-import {InstructionSet} from "../InstructionSet.ts";
+import {InstructionSet} from "./InstructionSet.ts";
 import {Memory} from "../Memory.ts";
-import {OpSemantics} from "../Op.ts";
+import {OpSemantics} from "./Op.ts";
 
 
 /**

client/src/machine/InstructionSet.ts → client/src/machine/asm/InstructionSet.ts

@@ -1,5 +1,5 @@
-import {assertByte} from "./core.ts";
-import {AddressingMode, Cycles, Instruction, InstructionCall} from "./mos6502.ts";
+import {assertByte} from "../core.ts";
+import {AddressingMode, Cycles, Instruction, InstructionCall} from "../mos6502.ts";
 import {Op} from "./Op.ts";
 
 /**

client/src/machine/mos6502.ts

@@ -10,8 +10,8 @@
  */
 
 import {Addr, assertByte, Byteable, unToSigned} from "./core.ts";
-import {InstructionSet} from "./InstructionSet.ts";
-import {Op, OpSemantics} from "./Op.ts";
+import {InstructionSet} from "./asm/InstructionSet.ts";
+import {Op, OpSemantics} from "./asm/Op.ts";
 
 type M6502OperandLength = 0 | 1 | 2;