6502/6502-opcodes
1
0
Fork 0
mirror of https://github.com/mcanlas/6502-opcodes.git synced 2024-06-01 15:41:35 +00:00
Code Issues Projects Releases Wiki Activity

120 supremacy

Browse Source
This commit is contained in:
Mark Canlas 2018-09-29 09:15:33 -04:00
parent de26422fa5
commit 9e6ad8012e
3 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.scalafmt.conf
View File

@ -3,6 +3,8 @@ align.tokens = [
{code = "%%", owner = "Term.ApplyInfix"}
]
maxColumn = 120
align.openParenCallSite = false
align = more

31
src/main/scala/com/htmlism/MatchOpcodes.scala
View File

@ -146,9 +146,7 @@ object MatchOpcodes {
quartile(out, 3, lookup)
}
def quartile(out: PrintWriter,
n: Int,
lookup: Map[Int, (Instruction, AddressingMode)]) = {
def quartile(out: PrintWriter, n: Int, lookup: Map[Int, (Instruction, AddressingMode)]) = {
out.print(s"<h2>${paddedBinary(n, 2)}</h2>")
out.print("<table>")
@ -234,14 +232,7 @@ object MatchOpcodes {
Seq(ORA, AND, EOR, ADC, STA, LDA, CMP, SBC)(aaa)
val addressingMode =
Seq(IndirectX,
ZeroPage,
Immediate,
Absolute,
IndirectY,
ZeroPageX,
AbsoluteY,
AbsoluteX)(bbb)
Seq(IndirectX, ZeroPage, Immediate, Absolute, IndirectY, ZeroPageX, AbsoluteY, AbsoluteX)(bbb)
Some(instruction -> addressingMode)
}
@ -251,14 +242,7 @@ object MatchOpcodes {
Seq(ASL, ROL, LSR, ROR, STX, LDX, DEC, INC)(aaa)
val addressingMode =
Seq(Immediate,
ZeroPage,
Accumulator,
Absolute,
NoMode,
ZeroPageX,
NoMode,
AbsoluteX)(bbb)
Seq(Immediate, ZeroPage, Accumulator, Absolute, NoMode, ZeroPageX, NoMode, AbsoluteX)(bbb)
Some(instruction -> addressingMode)
}
@ -268,14 +252,7 @@ object MatchOpcodes {
Seq(NoInstruction, BIT, JMP, JMP, STY, LDY, CPY, CPX)(aaa)
val addressingMode =
Seq(Immediate,
ZeroPage,
NoMode,
Absolute,
NoMode,
ZeroPageX,
NoMode,
AbsoluteX)(bbb)
Seq(Immediate, ZeroPage, NoMode, Absolute, NoMode, ZeroPageX, NoMode, AbsoluteX)(bbb)
Some(instruction -> addressingMode)
}

3
src/main/scala/com/htmlism/ShiftExtractor.scala
View File

@ -28,8 +28,7 @@ object AtomExtractor {
pow(ex - 1, acc * 2)
}
abstract class PrimitiveBitExtractor(val length: Int)
extends BitExtractor[Int] {
abstract class PrimitiveBitExtractor(val length: Int) extends BitExtractor[Int] {
private lazy val mask = AtomExtractor.pow(length) - 1
def unapply(n: Int): Option[Int] = Some(n & mask)