Skip to content

Commit 308ee29

Browse files
RupertAveryRupertAvery
committedNov 14, 2020
Implemented tips
Code cleanup Start implementing file loading/saving
·
v0.2betav0.1beta
1 parent 83caacc commit 308ee29

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1843
-1088
lines changed
 

‎CMakeLists.txt

+62-8
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,67 @@ set(CMAKE_AUTORCC ON)
88
find_package(Qt5 COMPONENTS Core Widgets Gui REQUIRED)
99
find_package(Threads REQUIRED)
1010

11-
set(WIDGETS_SRC src/widgets/display.cpp src/widgets/keypad.cpp src/widgets/memory_view.cpp src/widgets/disassembly_view.cpp src/widgets/status_view.cpp)
12-
set(WINDOWS_SRC ${WIDGETS_SRC} src/windows/mainwindow.cpp src/windows/about.cpp src/windows/settings.cpp src/windows/debugger.cpp src/windows/file.cpp src/windows/add_label.cpp src/windows/remove_label.cpp)
13-
set(DEVSRC src/dev/memory_map.cpp src/dev/memory_dev.cpp src/dev/keypad_dev.cpp src/dev/display_dev.cpp)
14-
set(EMUSRC src/cpu/m6800.cpp src/emu/et3400.cpp)
15-
set(TOOLSRC src/util/srec.cpp src/util/map.cpp src/util/disassembly_builder.cpp src/dasm/disassembler.cpp src/cpu/breakpoint_manager.cpp)
16-
set(SOURCES src/main.cpp ${TOOLSRC} ${DEVSRC} ${EMUSRC} ${WINDOWS_SRC} src/resources/resources.qrc src/resources/resources.rc)
11+
set(WIDGETS_SRC
12+
src/widgets/display.cpp
13+
src/widgets/keypad.cpp
14+
src/widgets/memory_view.cpp
15+
src/widgets/disassembly_view.cpp
16+
src/widgets/status_view.cpp
17+
)
1718

18-
add_executable(et3400 ${SOURCES} ${PROJECT_RESOURCES})
19+
set(WINDOWS_SRC
20+
${WIDGETS_SRC}
21+
src/windows/mainwindow.cpp
22+
src/windows/about.cpp
23+
src/windows/settings.cpp
24+
src/windows/debugger.cpp
25+
src/windows/file.cpp
26+
src/windows/add_label.cpp
27+
src/windows/remove_label.cpp
28+
src/windows/tips.cpp
29+
)
1930

20-
target_link_libraries(et3400 PRIVATE Qt5::Core Qt5::Widgets Qt5::Gui Threads::Threads)
31+
set(DEVSRC
32+
src/dev/memory_map.cpp
33+
src/dev/memory_dev.cpp
34+
src/dev/keypad_dev.cpp
35+
src/dev/display_dev.cpp
36+
)
37+
38+
set(EMUSRC
39+
src/cpu/m6800.cpp
40+
src/emu/et3400.cpp
41+
)
42+
43+
set(TOOLSRC
44+
src/util/srec.cpp
45+
src/util/label.cpp
46+
src/util/label_manager.cpp
47+
src/util/disassembly_builder.cpp
48+
src/util/breakpoint_manager.cpp
49+
src/util/settings.cpp
50+
src/dasm/disassembler.cpp
51+
)
52+
53+
set(SOURCES
54+
src/main.cpp
55+
${TOOLSRC}
56+
${DEVSRC}
57+
${EMUSRC}
58+
${WINDOWS_SRC}
59+
src/resources/resources.qrc
60+
src/resources/resources.rc
61+
)
62+
63+
add_executable(et3400
64+
${SOURCES}
65+
${PROJECT_RESOURCES}
66+
)
67+
68+
target_link_libraries(et3400
69+
PRIVATE
70+
Qt5::Core
71+
Qt5::Widgets
72+
Qt5::Gui
73+
Threads::Threads
74+
)

‎samples/test.obj

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
S1030000bd010041
2+
S1100003bd0126bd016ebd0190bd019620f2fdfd41
3+
S1100013fdcdcdcdcdcdcdcd010204081020408068
4+
S105002601fdfdfd0007
5+
S107002b0ffdfdfdcd02002a
6+
S110003201fdfdfdcdcd191e161514131b1a252664
7+
S11000422e292a2b2324fdfdfdcdcdcdcdcdcdcd7a
8+
S1100052cdcdcdcdcdcd10fdfdfdcdcdcdcdcdcd5c
9+
S1100062cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2f
10+
S1100072cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2f
11+
S1100082cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2f
12+
S1100092cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2f
13+
S11000a2cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2f
14+
S11000b2cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2f
15+
S11000c2cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2f
16+
S10e00d2cdcdcdcdcdcdcdcdcdff7ffe02004c
17+
S10d00e0fc24fc19ffffffffffffffff00d2
18+
S10600edcbffcdc10f0098
19+
S10f00f3cbcdcdcdcdcdcdcdcdcdcdcdcd7f0019
20+
S1030102157f006a
21+
S1030105167f006a
22+
S1030108177f0068
23+
S103010b187f0068
24+
S103010e197f0066
25+
S11001111abd016e9626971196259712962497138d
26+
S110012196239714394f9733bd01d597349633ce54
27+
S107013237084a2afca600a9
28+
S10701399735444444ce0099
29+
S10d014014084a2afcdf3696358407ce0039
30+
S107014d1a084a2afca600c7
31+
S1040154de367d006d
32+
S1050158342704aa00f5
33+
S105015d200343a400f5
34+
S1020162a70057
35+
S10201647c0082
36+
S110016633963391582dbc39bdfcbc961abdfe3add
37+
S11001769619bdfe3a9618bdfe3a9617bdfe3a967f
38+
S110018616bdfe3a9615bdfe3a39de310926fd39a6
39+
S10201967f007f
40+
S1030198287f0057
41+
S104019b294fce00b9
42+
S107019f29084a2afca600b8
43+
S10901a6bd01d59b2897287c006d
44+
S10f01af299629913026e79628840197287800cf
45+
S11001be1196124997129613499713961449971419
46+
S10d01ce96289b1197113916444444ce0003
47+
S10701db10084a2afca600d1
48+
S10701e29727178407ce00d0
49+
S10701e91a084a2afce60087
50+
S11001f04fd5272702860139fdfdfdcdcdcdcdcdd1
51+
S1100200cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
52+
S1100210cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
53+
S1100220cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
54+
S1100230cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
55+
S1100240cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
56+
S1100250cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
57+
S1100260cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
58+
S1100270cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
59+
S1100280cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
60+
S1100290cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
61+
S11002a0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
62+
S11002b0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
63+
S11002c0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
64+
S11002d0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
65+
S11002e0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2d
66+
S11002f0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
67+
S1100300cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
68+
S1100310cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
69+
S1100320cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
70+
S1100330cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
71+
S1100340cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
72+
S1100350cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
73+
S1100360cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
74+
S1100370cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
75+
S1100380cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
76+
S1100390cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
77+
S11003a0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
78+
S11003b0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
79+
S11003c0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
80+
S11003d0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
81+
S11003e0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2c
82+
S11003f0cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd2b

0 commit comments

Comments
 (0)
Please sign in to comment.