Better CRLF handling in LD command

10 files changed, 125 insertions, 104 deletions

diff --git a/cmpen472hw12_McDonnell/Full_Chip_Simulation.ini b/cmpen472hw12_McDonnell/Full_Chip_Simulation.ini
index 13e0809..bac998b 100644
--- a/cmpen472hw12_McDonnell/Full_Chip_Simulation.ini
+++ b/cmpen472hw12_McDonnell/Full_Chip_Simulation.ini
@@ -10,7 +10,7 @@ Target=sim
 Layout=ASM_layout.hwl
 LoadDialogOptions=AUTOERASEANDFLASH NORUNAFTERLOAD
 CPU=HC12
-MainFrame=0,1,-1,-1,-1,-1,564,142,2384,1131
+MainFrame=2,3,-1,-1,-1,-1,14,61,1834,1050
 Configuration=Full_Chip_Simulation.hwc
 Statusbar=1
 ShowToolbar=1
diff --git a/cmpen472hw12_McDonnell/Sources/main.asm b/cmpen472hw12_McDonnell/Sources/main.asm
index a102cf5..b2b5d0d 100644
--- a/cmpen472hw12_McDonnell/Sources/main.asm
+++ b/cmpen472hw12_McDonnell/Sources/main.asm
@@ -415,26 +415,32 @@ LDCommand
 LDLoop      dbeq        y,LDDone        ; Decrement y, y == 0, done
             jsr         GetCharLoop     ; Read Character from serial
             cmpa        #CR             ; Compare to CR
-            bne         NotNewline      ; If A != CR, not newline
+            bne         NotCR           ; If A != CR, not CR
             jsr         putchar         ; Echo to serial
             jsr         GetCharLoop     ; Read Character from serial
-            cmpa        #LF             ; Compare to LF
+NotCR       cmpa        #LF             ; Compare to LF
             bne         NotNewline      ; If not LF, skip next read
             jsr         putchar         ; Echo to serial
             jsr         GetCharLoop     ; Read Character from serial
+            cmpa        #CR             ; Compare to CR
+            bne         NotNewline      ; If not CR, skip next read
+            jsr         GetCharLoop     ; Read Character from serial
 NotNewline  jsr         putchar         ; Echo to serial
             jsr         IsValidHex      ; Check if valid hex
             beq         LDInvalid       ; If Z == 1, invalid
             tab                         ; Transfer A to B
             jsr         GetCharLoop     ; Read Character from serial
             cmpa        #CR             ; Compare to CR
-            bne         NotNewline2     ; If A != CR, not newline
+            bne         NotCR2          ; If A != CR, not CR
             jsr         putchar         ; Echo to serial
             jsr         GetCharLoop     ; Read Character from serial
-            cmpa        #LF             ; Compare to LF
+NotCR2      cmpa        #LF             ; Compare to LF
             bne         NotNewline2     ; If not LF, skip next read
             jsr         putchar         ; Echo to serial
             jsr         GetCharLoop     ; Read Character from serial
+            cmpa        #CR             ; Compare to CR
+            bne         NotNewline2     ; If not CR, skip next read
+            jsr         GetCharLoop     ; Read Character from serial
 NotNewline2 jsr         putchar         ; Echo to serial
             jsr         IsValidHex      ; Check if valid hex
             beq         LDInvalid       ; If Z == 1, invalid
@@ -911,6 +917,8 @@ readLoop    jsr        getchar          ; Jump to putchar to write byte to seria
             beq        readLoop         ; While A == 0, loop
             cmpa       #CR              ; If A == CR, exit loop
             beq        doneRead         ; Branch to doneRead if A == CR
+            cmpa       #LF              ; If A == LF, exit loop
+            beq        doneRead         ; Branch to doneRead if A == CR
             staa       1,x+             ; Save the byte to the addr in X, then add 1
             jsr        putchar          ; Write Character back to the terminal
             dey                         ; Decrement Y by 1
diff --git a/cmpen472hw12_McDonnell/bin/Project.abs b/cmpen472hw12_McDonnell/bin/Project.abs
index dedfe7d..38ecb85 100644
--- a/cmpen472hw12_McDonnell/bin/Project.abs
+++ b/cmpen472hw12_McDonnell/bin/Project.abs
diff --git a/cmpen472hw12_McDonnell/bin/Project.abs.s19 b/cmpen472hw12_McDonnell/bin/Project.abs.s19
index 5f86e88..9e8e6c0 100644
--- a/cmpen472hw12_McDonnell/bin/Project.abs.s19
+++ b/cmpen472hw12_McDonnell/bin/Project.abs.s19
@@ -1,60 +1,60 @@
 S0590000433A5C55736572735C4A61636F62204D63446F6E6E656C6C5C446F63756D656E74735C434D50454E2D3437322D48575C636D70656E343732687731325F4D63446F6E6E656C6C5C62696E5C50726F6A6563742E6162731C
 S1233000000500000000000000000000000000000000000010000000000000000000000097
 S10B3020000000000000001094
-S1233100CF310086FF5A03860C5ACBCC00015CC8CE368B1635B7CE3002FD30131635A886D7
-S12331203E1635E286201635E2CE3002FD30131635C3CE300216314C20DCCE363A1635B730
-S12331401635E927FB1635E25A0120F4343BA6308157182700D181511827011A814D274DDE
+S1233100CF310086FF5A03860C5ACBCC00015CC8CE369D1635C5CE3002FD30131635B686A9
+S12331203E1635F486201635F4CE3002FD30131635D1CE300216314C20DCCE364C1635C5DE
+S12331401635FB27FB1635F45A0120F4343BA6308157182700D181511827011A814D274DBA
 S1233160814C1827008C814727268153182600FDA6008124182600F516328F182700DBB769
-S1233180E534CE3002FD30131635A830182000C4A630814F182600D5A6008124182600CDA4
+S1233180E534CE3002FD30131635B630182000C4A630814F182600D5A6008124182600CD96
 S12331A016328F182700B31540182000AAA6308144182600B8A6008124182600B016328F6A
 S12331C018270096B7E43BA6301827009681201827FFF481241826008A0916328F18270036
 S12331E0823AB7C53B8D000225793A1632DA18200065A63081442675A6008124266F1632D4
 S12332008F2757B7E43BA6302759812027F8812426510916328F274B3AB7C53B8D0001259F
 S1233220423A16334A2030A6008124264016328F2728B7E43BA630272A812027F8812427CB
-S123324008091633D8271C20060916328F27143AB7C56D001634053A303DCE35F21635B7A4
-S12332603A303DCE360B1635B73A3A303DCE36211635B73A303DA630815526F1A630814980
+S123324008091633E6271C20060916328F27143AB7C56D001634133A303DCE36041635C567
+S12332603A303DCE361D1635C53A3A303DCE36331635C53A303DA630815526F1A630814940
 S123328026EBA630815426E5A63026E106313A3BCD0000E630C124263BE6302732C120273A
 S12332A02EC1302D2FC139220EC03037CC001013B7C63319ED20E2C1412D19C1462215C051
 S12332C041CB0A37CC001013B7C63319ED20CA87B7023A3D8604B7023A3D34353B3435B7D9
-S12332E054CE3002FD30131635A8CD30021634E486201635E23130CC00008D0000273D0322
-S123330003E630163496E630163496B760840F26E9860D1635E2860A1635E28D0000271CB4
-S12333203435B754CE3002FD30131635A8CD30021634E486201635E2313020BE860D1635C5
-S1233340E2860A1635E23A31303D34353B020406491633BC810D26101635E21633BC810A73
-S123336026061635E21633BC1635E21633C22738180E1633BC810D26101635E21633BC81B2
-S12333800A26061635E21633BC1635E21633C22717B7811634CA6A3020B4860D1635E2864B
-S12333A00A1635E23A31303D860D1635E2860A1635E2CE360B1635B73A31303D1635E92739
-S12333C0FB3D8130250F81392308814125078146220310FB3D14043D3BCD0000E630271A11
-S12333E0C1202716C1302D17C1392213C03037CC000A13B7C63319ED20E287B7023A3D8642
-S123340004B7023A3D353BB7D4CD30021634E4B7C5863D1635E2863E1635E2EC00CE300203
-S1233420FD30131635A81634713686201635E21635E232CD30021634E43686201635E216E6
-S123344035E232CE3002FD30131635A8CD3002163556860D1635E2860A1635E23A313D34F3
-S12334603536A67F27056A3020F8876A303231303D343B37180E86251635E2CE001055B75B
-S12334802084018B301635E20405088E000826EE3320EB3A303D3B353487CE00101810B713
-S12334A050810A24048B3020048B41800A1635E2180F810A24048B3020048B41800A163549
-S12334C0E286201635E230313A3D814125028007803037C61012180F33C1412502C007C012
-S12334E03018063D343B358C000027533635348630CE3015CD00051635B13031876A403299
-S1233500CE001018108E00002716C10A2D0ACB41C00A6B60B7D420E8CB306B60B7D420E04F
-S12335208C000026E586246A60CE301516345F1635B7FD3026CE30151635A8313A303D8607
-S1233540241635E286301635E21635E21635E21635E2313A303D343B358C000027413635D1
-S1233560348630CE3015CD00051635B13031876A4032CE000A18108E00002708CB306B6035
-S1233580B7D420EE8C000026F3CE301516345F1635B7FD3026CE30151635A8313A303D8674
-S12335A0301635E2313A303D36876A300436FB323D6A300436FB3D36A63027051635E22046
-S12335C0F7323D3635341635E927FB810D270A6A301635E203270220ED860A1635E23031AF
-S12335E0323D4FCC80FC5ACF3D4FCC200396CF3D873D696E76616C696420696E7075742C54
-S123360020616464726573730D0A00696E76616C696420696E7075742C20646174610D0A55
-S123362000696E76616C696420696E7075742C20636F6D6D616E640D0A0057656C636F6DA6
-S12336406520746F2054797065205772697465722C20796F75206D6179207479706520622B
-S1233660656C6F772E0D0A5265737461727420746F20656E746572206D61696E206D656EFF
-S12336807520616761696E2E0D0A00533A20202020202053686F772074686520636F6E7429
-S12336A0656E7473206F66206D656D6F7279206C6F636174696F6E20696E20776F72640D45
-S12336C00A573A202020202020577269746520746865206461746120776F726420286E6F64
-S12336E07420627974652920746F206D656D6F7279206C6F636174696F6E0D0A4D443A201E
-S123370020202020446973706C61792074686520636F6E74656E7473206F6620636F6E7497
-S1233720696E756F7573206D656D6F7279206C6F636174696F6E730D0A4C443A20202020DC
-S1233740204C6F6164206120626C6F636B206F66206461746120746F20636F6E74696E7547
-S12337606F7573206D656D6F7279206C6F636174696F6E730D0A474F3A20202020205275FB
-S12337806E207468652070726F6772616D2061742074686520737065636966696564206D8F
-S12337A0656D6F7279206C6F636174696F6E0D0A515549543A202020517569742074686568
-S12337C0206D61696E2070726F6772616D2C2072756E205479706520777269746572207058
-S10D37E0726F6772616D2E0D0A000E
+S12332E054CE3002FD30131635B6CD30021634F286201635F43130CC00008D0000273D03F4
+S123330003E6301634A4E6301634A4B760840F26E9860D1635F4860A1635F48D0000271C74
+S12333203435B754CE3002FD30131635B6CD30021634F286201635F4313020BE860D163597
+S1233340F4860A1635F43A31303D34353B020406571633CA810D26061635F41633CA810A1D
+S1233360260D1635F41633CA810D26031633CA1635F41633D0273F180E1633CA810D260649
+S12333801635F41633CA810A260D1635F41633CA810D26031633CA1635F41633D02717B7B0
+S12333A0811634D86A3020A6860D1635F4860A1635F43A31303D860D1635F4860A1635F4EC
+S12333C0CE361D1635C53A31303D1635FB27FB3D8130250F81392308814125078146220397
+S12333E010FB3D14043D3BCD0000E630271AC1202716C1302D17C1392213C03037CC000A4E
+S123340013B7C63319ED20E287B7023A3D8604B7023A3D353BB7D4CD30021634F2B7C58634
+S12334203D1635F4863E1635F4EC00CE3002FD30131635B616347F3686201635F41635F4B9
+S123344032CD30021634F23686201635F41635F432CE3002FD30131635B6CD300216356480
+S1233460860D1635F4860A1635F43A313D343536A67F27056A3020F8876A303231303D3438
+S12334803B37180E86251635F4CE001055B72084018B301635F40405088E000826EE33200F
+S12334A0EB3A303D3B353487CE00101810B750810A24048B3020048B41800A1635F4180FF0
+S12334C0810A24048B3020048B41800A1635F486201635F430313A3D8141250280078030E4
+S12334E037C61012180F33C1412502C007C03018063D343B358C000027533635348630CE47
+S12335003015CD00051635BF3031876A4032CE001018108E00002716C10A2D0ACB41C00A19
+S12335206B60B7D420E8CB306B60B7D420E08C000026E586246A60CE301516346D1635C5F3
+S1233540FD3026CE30151635B6313A303D86241635F486301635F41635F41635F41635F48D
+S1233560313A303D343B358C000027413635348630CE3015CD00051635BF3031876A4032CF
+S1233580CE000A18108E00002708CB306B60B7D420EE8C000026F3CE301516346D1635C58C
+S12335A0FD3026CE30151635B6313A303D86301635F4313A303D36876A300436FB323D6A96
+S12335C0300436FB3D36A63027051635F420F7323D3635341635FB27FB810D270E810A27CC
+S12335E00A6A301635F403270220E9860A1635F43031323D4FCC80FC5ACF3D4FCC2003963F
+S1233600CF3D873D696E76616C696420696E7075742C20616464726573730D0A00696E7609
+S1233620616C696420696E7075742C20646174610D0A00696E76616C696420696E70757468
+S12336402C20636F6D6D616E640D0A0057656C636F6D6520746F20547970652057726974CD
+S123366065722C20796F75206D617920747970652062656C6F772E0D0A526573746172741A
+S123368020746F20656E746572206D61696E206D656E7520616761696E2E0D0A00533A2039
+S12336A0202020202053686F772074686520636F6E74656E7473206F66206D656D6F727928
+S12336C0206C6F636174696F6E20696E20776F72640D0A573A202020202020577269746527
+S12336E020746865206461746120776F726420286E6F7420627974652920746F206D656DD7
+S12337006F7279206C6F636174696F6E0D0A4D443A2020202020446973706C61792074687E
+S12337206520636F6E74656E7473206F6620636F6E74696E756F7573206D656D6F7279204D
+S12337406C6F636174696F6E730D0A4C443A20202020204C6F6164206120626C6F636B20CC
+S12337606F66206461746120746F20636F6E74696E756F7573206D656D6F7279206C6F6325
+S12337806174696F6E730D0A474F3A202020202052756E207468652070726F6772616D2042
+S12337A061742074686520737065636966696564206D656D6F7279206C6F636174696F6ED1
+S12337C00D0A515549543A2020205175697420746865206D61696E2070726F6772616D2CE4
+S11F37E02072756E2054797065207772697465722070726F6772616D2E0D0A0078
 S9030000FC
diff --git a/cmpen472hw12_McDonnell/bin/main.dbg b/cmpen472hw12_McDonnell/bin/main.dbg
index 0e16fc5..612030a 100644
--- a/cmpen472hw12_McDonnell/bin/main.dbg
+++ b/cmpen472hw12_McDonnell/bin/main.dbg
@@ -415,26 +415,32 @@ LDCommand
 LDLoop      dbeq        y,LDDone        ; Decrement y, y == 0, done
             jsr         GetCharLoop     ; Read Character from serial
             cmpa        #CR             ; Compare to CR
-            bne         NotNewline      ; If A != CR, not newline
+            bne         NotCR           ; If A != CR, not CR
             jsr         putchar         ; Echo to serial
             jsr         GetCharLoop     ; Read Character from serial
-            cmpa        #LF             ; Compare to LF
+NotCR       cmpa        #LF             ; Compare to LF
             bne         NotNewline      ; If not LF, skip next read
             jsr         putchar         ; Echo to serial
             jsr         GetCharLoop     ; Read Character from serial
+            cmpa        #CR             ; Compare to CR
+            bne         NotNewline      ; If not CR, skip next read
+            jsr         GetCharLoop     ; Read Character from serial
 NotNewline  jsr         putchar         ; Echo to serial
             jsr         IsValidHex      ; Check if valid hex
             beq         LDInvalid       ; If Z == 1, invalid
             tab                         ; Transfer A to B
             jsr         GetCharLoop     ; Read Character from serial
             cmpa        #CR             ; Compare to CR
-            bne         NotNewline2     ; If A != CR, not newline
+            bne         NotCR2          ; If A != CR, not CR
             jsr         putchar         ; Echo to serial
             jsr         GetCharLoop     ; Read Character from serial
-            cmpa        #LF             ; Compare to LF
+NotCR2      cmpa        #LF             ; Compare to LF
             bne         NotNewline2     ; If not LF, skip next read
             jsr         putchar         ; Echo to serial
             jsr         GetCharLoop     ; Read Character from serial
+            cmpa        #CR             ; Compare to CR
+            bne         NotNewline2     ; If not CR, skip next read
+            jsr         GetCharLoop     ; Read Character from serial
 NotNewline2 jsr         putchar         ; Echo to serial
             jsr         IsValidHex      ; Check if valid hex
             beq         LDInvalid       ; If Z == 1, invalid
@@ -911,6 +917,8 @@ readLoop    jsr        getchar          ; Jump to putchar to write byte to seria
             beq        readLoop         ; While A == 0, loop
             cmpa       #CR              ; If A == CR, exit loop
             beq        doneRead         ; Branch to doneRead if A == CR
+            cmpa       #LF              ; If A == LF, exit loop
+            beq        doneRead         ; Branch to doneRead if A == CR
             staa       1,x+             ; Save the byte to the addr in X, then add 1
             jsr        putchar          ; Write Character back to the terminal
             dey                         ; Decrement Y by 1
diff --git a/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/ObjectCode/main.asm.o b/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/ObjectCode/main.asm.o
index dedfe7d..38ecb85 100644
--- a/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/ObjectCode/main.asm.o
+++ b/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/ObjectCode/main.asm.o
diff --git a/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/ObjectCode/main.asm.sx b/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/ObjectCode/main.asm.sx
index 48035c8..da89c39 100644
--- a/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/ObjectCode/main.asm.sx
+++ b/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/ObjectCode/main.asm.sx
@@ -1,60 +1,60 @@
 S0860000433A5C55736572735C4A61636F62204D63446F6E6E656C6C5C446F63756D656E74735C434D50454E2D3437322D48575C636D70656E343732687731325F4D63446F6E6E656C6C5C636D70656E343732687731325F4D63446F6E6E656C6C5F446174615C5374616E646172645C4F626A656374436F64655C6D61696E2E61736D2E70726D71
 S1233000000500000000000000000000000000000000000010000000000000000000000097
 S10B3020000000000000001094
-S1233100CF310086FF5A03860C5ACBCC00015CC8CE368B1635B7CE3002FD30131635A886D7
-S12331203E1635E286201635E2CE3002FD30131635C3CE300216314C20DCCE363A1635B730
-S12331401635E927FB1635E25A0120F4343BA6308157182700D181511827011A814D274DDE
+S1233100CF310086FF5A03860C5ACBCC00015CC8CE369D1635C5CE3002FD30131635B686A9
+S12331203E1635F486201635F4CE3002FD30131635D1CE300216314C20DCCE364C1635C5DE
+S12331401635FB27FB1635F45A0120F4343BA6308157182700D181511827011A814D274DBA
 S1233160814C1827008C814727268153182600FDA6008124182600F516328F182700DBB769
-S1233180E534CE3002FD30131635A830182000C4A630814F182600D5A6008124182600CDA4
+S1233180E534CE3002FD30131635B630182000C4A630814F182600D5A6008124182600CD96
 S12331A016328F182700B31540182000AAA6308144182600B8A6008124182600B016328F6A
 S12331C018270096B7E43BA6301827009681201827FFF481241826008A0916328F18270036
 S12331E0823AB7C53B8D000225793A1632DA18200065A63081442675A6008124266F1632D4
 S12332008F2757B7E43BA6302759812027F8812426510916328F274B3AB7C53B8D0001259F
 S1233220423A16334A2030A6008124264016328F2728B7E43BA630272A812027F8812427CB
-S123324008091633D8271C20060916328F27143AB7C56D001634053A303DCE35F21635B7A4
-S12332603A303DCE360B1635B73A3A303DCE36211635B73A303DA630815526F1A630814980
+S123324008091633E6271C20060916328F27143AB7C56D001634133A303DCE36041635C567
+S12332603A303DCE361D1635C53A3A303DCE36331635C53A303DA630815526F1A630814940
 S123328026EBA630815426E5A63026E106313A3BCD0000E630C124263BE6302732C120273A
 S12332A02EC1302D2FC139220EC03037CC001013B7C63319ED20E2C1412D19C1462215C051
 S12332C041CB0A37CC001013B7C63319ED20CA87B7023A3D8604B7023A3D34353B3435B7D9
-S12332E054CE3002FD30131635A8CD30021634E486201635E23130CC00008D0000273D0322
-S123330003E630163496E630163496B760840F26E9860D1635E2860A1635E28D0000271CB4
-S12333203435B754CE3002FD30131635A8CD30021634E486201635E2313020BE860D1635C5
-S1233340E2860A1635E23A31303D34353B020406491633BC810D26101635E21633BC810A73
-S123336026061635E21633BC1635E21633C22738180E1633BC810D26101635E21633BC81B2
-S12333800A26061635E21633BC1635E21633C22717B7811634CA6A3020B4860D1635E2864B
-S12333A00A1635E23A31303D860D1635E2860A1635E2CE360B1635B73A31303D1635E92739
-S12333C0FB3D8130250F81392308814125078146220310FB3D14043D3BCD0000E630271A11
-S12333E0C1202716C1302D17C1392213C03037CC000A13B7C63319ED20E287B7023A3D8642
-S123340004B7023A3D353BB7D4CD30021634E4B7C5863D1635E2863E1635E2EC00CE300203
-S1233420FD30131635A81634713686201635E21635E232CD30021634E43686201635E216E6
-S123344035E232CE3002FD30131635A8CD3002163556860D1635E2860A1635E23A313D34F3
-S12334603536A67F27056A3020F8876A303231303D343B37180E86251635E2CE001055B75B
-S12334802084018B301635E20405088E000826EE3320EB3A303D3B353487CE00101810B713
-S12334A050810A24048B3020048B41800A1635E2180F810A24048B3020048B41800A163549
-S12334C0E286201635E230313A3D814125028007803037C61012180F33C1412502C007C012
-S12334E03018063D343B358C000027533635348630CE3015CD00051635B13031876A403299
-S1233500CE001018108E00002716C10A2D0ACB41C00A6B60B7D420E8CB306B60B7D420E04F
-S12335208C000026E586246A60CE301516345F1635B7FD3026CE30151635A8313A303D8607
-S1233540241635E286301635E21635E21635E21635E2313A303D343B358C000027413635D1
-S1233560348630CE3015CD00051635B13031876A4032CE000A18108E00002708CB306B6035
-S1233580B7D420EE8C000026F3CE301516345F1635B7FD3026CE30151635A8313A303D8674
-S12335A0301635E2313A303D36876A300436FB323D6A300436FB3D36A63027051635E22046
-S12335C0F7323D3635341635E927FB810D270A6A301635E203270220ED860A1635E23031AF
-S12335E0323D4FCC80FC5ACF3D4FCC200396CF3D873D696E76616C696420696E7075742C54
-S123360020616464726573730D0A00696E76616C696420696E7075742C20646174610D0A55
-S123362000696E76616C696420696E7075742C20636F6D6D616E640D0A0057656C636F6DA6
-S12336406520746F2054797065205772697465722C20796F75206D6179207479706520622B
-S1233660656C6F772E0D0A5265737461727420746F20656E746572206D61696E206D656EFF
-S12336807520616761696E2E0D0A00533A20202020202053686F772074686520636F6E7429
-S12336A0656E7473206F66206D656D6F7279206C6F636174696F6E20696E20776F72640D45
-S12336C00A573A202020202020577269746520746865206461746120776F726420286E6F64
-S12336E07420627974652920746F206D656D6F7279206C6F636174696F6E0D0A4D443A201E
-S123370020202020446973706C61792074686520636F6E74656E7473206F6620636F6E7497
-S1233720696E756F7573206D656D6F7279206C6F636174696F6E730D0A4C443A20202020DC
-S1233740204C6F6164206120626C6F636B206F66206461746120746F20636F6E74696E7547
-S12337606F7573206D656D6F7279206C6F636174696F6E730D0A474F3A20202020205275FB
-S12337806E207468652070726F6772616D2061742074686520737065636966696564206D8F
-S12337A0656D6F7279206C6F636174696F6E0D0A515549543A202020517569742074686568
-S12337C0206D61696E2070726F6772616D2C2072756E205479706520777269746572207058
-S10D37E0726F6772616D2E0D0A000E
+S12332E054CE3002FD30131635B6CD30021634F286201635F43130CC00008D0000273D03F4
+S123330003E6301634A4E6301634A4B760840F26E9860D1635F4860A1635F48D0000271C74
+S12333203435B754CE3002FD30131635B6CD30021634F286201635F4313020BE860D163597
+S1233340F4860A1635F43A31303D34353B020406571633CA810D26061635F41633CA810A1D
+S1233360260D1635F41633CA810D26031633CA1635F41633D0273F180E1633CA810D260649
+S12333801635F41633CA810A260D1635F41633CA810D26031633CA1635F41633D02717B7B0
+S12333A0811634D86A3020A6860D1635F4860A1635F43A31303D860D1635F4860A1635F4EC
+S12333C0CE361D1635C53A31303D1635FB27FB3D8130250F81392308814125078146220397
+S12333E010FB3D14043D3BCD0000E630271AC1202716C1302D17C1392213C03037CC000A4E
+S123340013B7C63319ED20E287B7023A3D8604B7023A3D353BB7D4CD30021634F2B7C58634
+S12334203D1635F4863E1635F4EC00CE3002FD30131635B616347F3686201635F41635F4B9
+S123344032CD30021634F23686201635F41635F432CE3002FD30131635B6CD300216356480
+S1233460860D1635F4860A1635F43A313D343536A67F27056A3020F8876A303231303D3438
+S12334803B37180E86251635F4CE001055B72084018B301635F40405088E000826EE33200F
+S12334A0EB3A303D3B353487CE00101810B750810A24048B3020048B41800A1635F4180FF0
+S12334C0810A24048B3020048B41800A1635F486201635F430313A3D8141250280078030E4
+S12334E037C61012180F33C1412502C007C03018063D343B358C000027533635348630CE47
+S12335003015CD00051635BF3031876A4032CE001018108E00002716C10A2D0ACB41C00A19
+S12335206B60B7D420E8CB306B60B7D420E08C000026E586246A60CE301516346D1635C5F3
+S1233540FD3026CE30151635B6313A303D86241635F486301635F41635F41635F41635F48D
+S1233560313A303D343B358C000027413635348630CE3015CD00051635BF3031876A4032CF
+S1233580CE000A18108E00002708CB306B60B7D420EE8C000026F3CE301516346D1635C58C
+S12335A0FD3026CE30151635B6313A303D86301635F4313A303D36876A300436FB323D6A96
+S12335C0300436FB3D36A63027051635F420F7323D3635341635FB27FB810D270E810A27CC
+S12335E00A6A301635F403270220E9860A1635F43031323D4FCC80FC5ACF3D4FCC2003963F
+S1233600CF3D873D696E76616C696420696E7075742C20616464726573730D0A00696E7609
+S1233620616C696420696E7075742C20646174610D0A00696E76616C696420696E70757468
+S12336402C20636F6D6D616E640D0A0057656C636F6D6520746F20547970652057726974CD
+S123366065722C20796F75206D617920747970652062656C6F772E0D0A526573746172741A
+S123368020746F20656E746572206D61696E206D656E7520616761696E2E0D0A00533A2039
+S12336A0202020202053686F772074686520636F6E74656E7473206F66206D656D6F727928
+S12336C0206C6F636174696F6E20696E20776F72640D0A573A202020202020577269746527
+S12336E020746865206461746120776F726420286E6F7420627974652920746F206D656DD7
+S12337006F7279206C6F636174696F6E0D0A4D443A2020202020446973706C61792074687E
+S12337206520636F6E74656E7473206F6620636F6E74696E756F7573206D656D6F7279204D
+S12337406C6F636174696F6E730D0A4C443A20202020204C6F6164206120626C6F636B20CC
+S12337606F66206461746120746F20636F6E74696E756F7573206D656D6F7279206C6F6325
+S12337806174696F6E730D0A474F3A202020202052756E207468652070726F6772616D2042
+S12337A061742074686520737065636966696564206D656D6F7279206C6F636174696F6ED1
+S12337C00D0A515549543A2020205175697420746865206D61696E2070726F6772616D2CE4
+S11F37E02072756E2054797065207772697465722070726F6772616D2E0D0A0078
 S9033100CB
diff --git a/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/TargetDataWindows.tdt b/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/TargetDataWindows.tdt
index 49d76ad..966f494 100644
--- a/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/TargetDataWindows.tdt
+++ b/cmpen472hw12_McDonnell/cmpen472hw12_McDonnell_Data/Standard/TargetDataWindows.tdt
diff --git a/cmpen472hw12_McDonnell/example.txt b/cmpen472hw12_McDonnell/example.txt
index 3c7d4a0..ad89ab7 100644
--- a/cmpen472hw12_McDonnell/example.txt
+++ b/cmpen472hw12_McDonnell/example.txt
@@ -1,4 +1,3 @@
-LD$3E00 $0030
 43686F69CF3E00CE3E00A6300713A630
 070FA630070BA6300707A7A7A7A7A720
 F94FCC80FC5ACF3D0000000000000000
\ No newline at end of file
diff --git a/cmpen472hw12_McDonnell/example2.txt b/cmpen472hw12_McDonnell/example2.txt
new file mode 100644
index 0000000..efbea7a
--- /dev/null
+++ b/cmpen472hw12_McDonnell/example2.txt
@@ -0,0 +1,6 @@
+LD$3E00 $0030
+43686F69CF3E00CE3E00A6300713A630
+070FA630070BA6300707A7A7A7A7A720
+F94FCC80FC5ACF3D0000000000000000
+MD$3E00 $0030
+GO$3E04
\ No newline at end of file