diff --git a/src/main/asm/ProcessorIntr.asm b/src/main/asm/ProcessorIntr.asm index cf306476c..e3e0bf811 100644 --- a/src/main/asm/ProcessorIntr.asm +++ b/src/main/asm/ProcessorIntr.asm @@ -1,7 +1,7 @@ - .const KEY 0x1e - .const TERM 0x1f - .const GPO 0x15 + .const KEY 0xe + .const TERM 0xf + .const GPO 0x5 jmp main diff --git a/src/main/asm/ProcessorIntr.hex b/src/main/asm/ProcessorIntr.hex index 3b271582f..9906cfc60 100644 --- a/src/main/asm/ProcessorIntr.hex +++ b/src/main/asm/ProcessorIntr.hex @@ -1,5 +1,5 @@ v2.0 raw -3d12 +3d10 0 ffff 31e0 @@ -7,10 +7,8 @@ ffff fffe 31e0 10e2 -801e -4100 -801f -3e00 +420e +3ff0 ce2 fffe 320e @@ -19,14 +17,12 @@ ffff 320e 4500 a01 -8015 -3e00 +3f50 2400 -38fc +38fd 8000 901 -8015 -3e00 +3f50 2500 -38fc -3df4 +38fd +3df6 diff --git a/src/main/dig/processor/ProcessorIntr.dig b/src/main/dig/processor/ProcessorIntr.dig index 59337b5ec..2b7bd306a 100644 --- a/src/main/dig/processor/ProcessorIntr.dig +++ b/src/main/dig/processor/ProcessorIntr.dig @@ -144,8 +144,8 @@ Single-Cycle CPU.}} Data - 3d12,0,ffff,31e0,4200,fffe,31e0,10e2,801e,4100,801f,3e00,ce2,fffe,320e,3f00,ffff, -320e,4500,a01,8015,3e00,2400,38fc,8000,901,8015,3e00,2500,38fc,3df4 + 3d10,0,ffff,31e0,4200,fffe,31e0,10e2,420e,3ff0,ce2,fffe,320e,3f00,ffff,320e,4500, +a01,3f50,2400,38fd,8000,901,3f50,2500,38fd,3df6 lastDataFile diff --git a/src/main/dig/processor/ProcessorVonNeumann.dig b/src/main/dig/processor/ProcessorVonNeumann.dig index 455d562f9..a53664faf 100644 --- a/src/main/dig/processor/ProcessorVonNeumann.dig +++ b/src/main/dig/processor/ProcessorVonNeumann.dig @@ -318,7 +318,7 @@ Von Neumann Two-Cycle CPU.}} ld - + Tunnel @@ -445,12 +445,12 @@ Von Neumann Two-Cycle CPU.}} S_in - + LedMatrix.dig - + Tunnel @@ -464,7 +464,7 @@ Von Neumann Two-Cycle CPU.}} ioW - + Tunnel @@ -478,7 +478,7 @@ Von Neumann Two-Cycle CPU.}} C - + RegisterOpt.dig @@ -755,7 +755,7 @@ Von Neumann Two-Cycle CPU.}} ClockDiv.dig - + Clock @@ -773,7 +773,7 @@ Von Neumann Two-Cycle CPU.}} 2147483647 - + Tunnel @@ -783,7 +783,7 @@ Von Neumann Two-Cycle CPU.}} C - + Tunnel @@ -793,7 +793,7 @@ Von Neumann Two-Cycle CPU.}} C_in - + Tunnel @@ -803,7 +803,7 @@ Von Neumann Two-Cycle CPU.}} S_in - + Const @@ -869,7 +869,7 @@ Von Neumann Two-Cycle CPU.}} - + @@ -894,8 +894,12 @@ Von Neumann Two-Cycle CPU.}} - - + + + + + + @@ -913,6 +917,10 @@ Von Neumann Two-Cycle CPU.}} + + + + @@ -993,10 +1001,6 @@ Von Neumann Two-Cycle CPU.}} - - - - @@ -1018,8 +1022,8 @@ Von Neumann Two-Cycle CPU.}} - - + + @@ -1029,6 +1033,10 @@ Von Neumann Two-Cycle CPU.}} + + + + @@ -1041,10 +1049,6 @@ Von Neumann Two-Cycle CPU.}} - - - - @@ -1057,6 +1061,10 @@ Von Neumann Two-Cycle CPU.}} + + + + @@ -1085,10 +1093,6 @@ Von Neumann Two-Cycle CPU.}} - - - - @@ -1097,6 +1101,10 @@ Von Neumann Two-Cycle CPU.}} + + + + @@ -1117,18 +1125,6 @@ Von Neumann Two-Cycle CPU.}} - - - - - - - - - - - - @@ -1150,8 +1146,8 @@ Von Neumann Two-Cycle CPU.}} - - + + @@ -1221,6 +1217,10 @@ Von Neumann Two-Cycle CPU.}} + + + + @@ -1239,7 +1239,7 @@ Von Neumann Two-Cycle CPU.}} - + @@ -1298,8 +1298,8 @@ Von Neumann Two-Cycle CPU.}} - - + + @@ -1347,7 +1347,7 @@ Von Neumann Two-Cycle CPU.}} - + @@ -1407,7 +1407,7 @@ Von Neumann Two-Cycle CPU.}} - + @@ -1446,12 +1446,12 @@ Von Neumann Two-Cycle CPU.}} - - + + - - + + @@ -1463,11 +1463,11 @@ Von Neumann Two-Cycle CPU.}} - + - - + +