Skip to content

Commit 3eba5c1

Browse files
sam-astrosam-astro
committed
fix issues
1 parent a4d3de1 commit 3eba5c1

Some content is hidden

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

54 files changed

+1910
-75
lines changed

‎Astro8-Emulator/.vs/Astro8-Emulator/FileContentIndex/read.lock

Whitespace-only changes.

‎Astro8-Emulator/.vs/Astro8-Emulator/v17/.suo

2.5 KB
Binary file not shown.

‎Astro8-Emulator/.vs/Astro8-Emulator/v17/DocumentLayout.json

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
{
2+
"Version": 1,
3+
"WorkspaceRootPath": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\",
4+
"Documents": [
5+
{
6+
"AbsoluteMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|D:\\Code\\Astro8-Computer\\Astro8-Emulator\\main.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
7+
"RelativeMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|solutionrelative:main.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
8+
},
9+
{
10+
"AbsoluteMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|D:\\Code\\Astro8-Computer\\Astro8-Emulator\\VSSynth\\VSSynth.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
11+
"RelativeMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|solutionrelative:VSSynth\\VSSynth.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
12+
},
13+
{
14+
"AbsoluteMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|D:\\Code\\Astro8-Computer\\Astro8-Emulator\\colorprint.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
15+
"RelativeMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|solutionrelative:colorprint.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
16+
},
17+
{
18+
"AbsoluteMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|D:\\Code\\Astro8-Computer\\Astro8-Emulator\\color.hpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
19+
"RelativeMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|solutionrelative:color.hpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
20+
},
21+
{
22+
"AbsoluteMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|D:\\Code\\Astro8-Computer\\Astro8-Emulator\\resource.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
23+
"RelativeMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|solutionrelative:resource.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
24+
},
25+
{
26+
"AbsoluteMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|D:\\Code\\Astro8-Computer\\Astro8-Emulator\\armstrong-compiler.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
27+
"RelativeMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|solutionrelative:armstrong-compiler.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
28+
},
29+
{
30+
"AbsoluteMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|D:\\Code\\Astro8-Computer\\Astro8-Emulator\\escapi.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
31+
"RelativeMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|solutionrelative:escapi.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
32+
},
33+
{
34+
"AbsoluteMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|D:\\Code\\Astro8-Computer\\Astro8-Emulator\\armstrong-compiler.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
35+
"RelativeMoniker": "D:0:0:{029D76C8-CA1A-4BAC-A1C5-9D9F600A5041}|Astro8-Emulator.vcxproj|solutionrelative:armstrong-compiler.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
36+
},
37+
{
38+
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|D:\\Code\\Astro8-Computer\\Astro8-Emulator\\CMakeLists.txt||{8B382828-6202-11D1-8870-0000F87579D2}",
39+
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:CMakeLists.txt||{8B382828-6202-11D1-8870-0000F87579D2}"
40+
}
41+
],
42+
"DocumentGroupContainers": [
43+
{
44+
"Orientation": 0,
45+
"VerticalTabListWidth": 256,
46+
"DocumentGroups": [
47+
{
48+
"DockedWidth": 200,
49+
"SelectedChildIndex": 2,
50+
"Children": [
51+
{
52+
"$type": "Bookmark",
53+
"Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
54+
},
55+
{
56+
"$type": "Document",
57+
"DocumentIndex": 1,
58+
"Title": "VSSynth.h",
59+
"DocumentMoniker": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\VSSynth\\VSSynth.h",
60+
"RelativeDocumentMoniker": "VSSynth\\VSSynth.h",
61+
"ToolTip": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\VSSynth\\VSSynth.h",
62+
"RelativeToolTip": "VSSynth\\VSSynth.h",
63+
"ViewState": "AQIAAAAAAAAAAAAAAAAAAA0AAAAZAAAA",
64+
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|",
65+
"WhenOpened": "2023-12-04T23:43:15.414Z"
66+
},
67+
{
68+
"$type": "Document",
69+
"DocumentIndex": 0,
70+
"Title": "main.cpp",
71+
"DocumentMoniker": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\main.cpp",
72+
"RelativeDocumentMoniker": "main.cpp",
73+
"ToolTip": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\main.cpp",
74+
"RelativeToolTip": "main.cpp",
75+
"ViewState": "AQIAABIAAAAAAAAAAAAAACQAAAAAAAAA",
76+
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
77+
"WhenOpened": "2022-08-11T16:44:18.922Z",
78+
"EditorCaption": ""
79+
},
80+
{
81+
"$type": "Document",
82+
"DocumentIndex": 6,
83+
"Title": "escapi.cpp",
84+
"DocumentMoniker": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\escapi.cpp",
85+
"RelativeDocumentMoniker": "escapi.cpp",
86+
"ToolTip": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\escapi.cpp",
87+
"RelativeToolTip": "escapi.cpp",
88+
"ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
89+
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
90+
"WhenOpened": "2022-10-30T00:48:25.594Z"
91+
},
92+
{
93+
"$type": "Document",
94+
"DocumentIndex": 4,
95+
"Title": "resource.h",
96+
"DocumentMoniker": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\resource.h",
97+
"RelativeDocumentMoniker": "resource.h",
98+
"ToolTip": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\resource.h",
99+
"RelativeToolTip": "resource.h",
100+
"ViewState": "AQIAAAAAAAAAAAAAAABBwAIAAAASAAAA",
101+
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|",
102+
"WhenOpened": "2022-09-08T21:09:31.467Z"
103+
},
104+
{
105+
"$type": "Document",
106+
"DocumentIndex": 3,
107+
"Title": "color.hpp",
108+
"DocumentMoniker": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\color.hpp",
109+
"RelativeDocumentMoniker": "color.hpp",
110+
"ToolTip": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\color.hpp",
111+
"RelativeToolTip": "color.hpp",
112+
"ViewState": "AQIAAAAAAAAAAAAAAAAAAOoBAAARAAAA",
113+
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|",
114+
"WhenOpened": "2022-09-08T21:08:41.8Z"
115+
},
116+
{
117+
"$type": "Document",
118+
"DocumentIndex": 8,
119+
"Title": "CMakeLists.txt",
120+
"DocumentMoniker": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\CMakeLists.txt",
121+
"RelativeDocumentMoniker": "CMakeLists.txt",
122+
"ToolTip": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\CMakeLists.txt",
123+
"RelativeToolTip": "CMakeLists.txt",
124+
"ViewState": "AQIAAAAAAAAAAAAAAAAAACEAAAAAAAAA",
125+
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|",
126+
"WhenOpened": "2022-08-16T14:05:34.319Z"
127+
},
128+
{
129+
"$type": "Document",
130+
"DocumentIndex": 5,
131+
"Title": "armstrong-compiler.h",
132+
"DocumentMoniker": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\armstrong-compiler.h",
133+
"RelativeDocumentMoniker": "armstrong-compiler.h",
134+
"ToolTip": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\armstrong-compiler.h",
135+
"RelativeToolTip": "armstrong-compiler.h",
136+
"ViewState": "AQIAABEAAAAAAAAAAAAnwC0AAAATAAAA",
137+
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|",
138+
"WhenOpened": "2022-08-12T18:14:32.628Z"
139+
},
140+
{
141+
"$type": "Document",
142+
"DocumentIndex": 2,
143+
"Title": "colorprint.h",
144+
"DocumentMoniker": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\colorprint.h",
145+
"RelativeDocumentMoniker": "colorprint.h",
146+
"ToolTip": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\colorprint.h",
147+
"RelativeToolTip": "colorprint.h",
148+
"ViewState": "AQIAAMEAAAAAAAAAAAAQwMcAAABfAAAA",
149+
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|",
150+
"WhenOpened": "2022-08-12T19:45:54.265Z"
151+
},
152+
{
153+
"$type": "Document",
154+
"DocumentIndex": 7,
155+
"Title": "armstrong-compiler.cpp",
156+
"DocumentMoniker": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\armstrong-compiler.cpp",
157+
"RelativeDocumentMoniker": "armstrong-compiler.cpp",
158+
"ToolTip": "D:\\Code\\Astro8-Computer\\Astro8-Emulator\\armstrong-compiler.cpp",
159+
"RelativeToolTip": "armstrong-compiler.cpp",
160+
"ViewState": "AQIAAIUBAAAAAAAAAAAnwJgBAAALAAAA",
161+
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
162+
"WhenOpened": "2022-08-12T18:02:15.829Z"
163+
}
164+
]
165+
}
166+
]
167+
}
168+
]
169+
}

‎Astro8-Emulator/.vs/Astro8-Emulator/v17/Preview/Browse.VC.db

-880 KB
Binary file not shown.

‎Astro8-Emulator/.vs/cmake.db-journal

24.5 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.log

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
 main.cpp
2+
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(68,13): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
3+
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(131,24): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
4+
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(132,24): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
5+
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(133,24): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
6+
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(134,24): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
7+
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(135,24): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
8+
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(136,24): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
9+
D:\Code\Astro8-Computer\Astro8-Emulator\colorprint.h(205,11): warning C4834: discarding return value of function with [[nodiscard]] attribute
10+
D:\Code\Astro8-Computer\Astro8-Emulator\colorprint.h(213,12): warning C4834: discarding return value of function with [[nodiscard]] attribute
11+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(428,22): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
12+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(442,17): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
13+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(925,36): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
14+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1248,22): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data
15+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1294,24): warning C5051: attribute [[likely]] requires at least '/std:c++20'; ignored
16+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1324,33): warning C5051: attribute [[unlikely]] requires at least '/std:c++20'; ignored
17+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1455,7): warning C5051: attribute [[likely]] requires at least '/std:c++20'; ignored
18+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1549,34): warning C5051: attribute [[unlikely]] requires at least '/std:c++20'; ignored
19+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1982,79): warning C4267: 'argument': conversion from 'size_t' to 'const _Ty', possible loss of data
20+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1982,79): warning C4267: with
21+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1982,79): warning C4267: [
22+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1982,79): warning C4267: _Ty=int
23+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1982,79): warning C4267: ]
24+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(2047,45): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
25+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(2047,32): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
26+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(2819,34): warning C4267: '=': conversion from 'size_t' to 'uint8_t', possible loss of data
27+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(2900,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
28+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(2903,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
29+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(2906,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
30+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(3116,29): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
31+
Generating code
32+
132 of 2168 functions ( 6.1%) were compiled, the rest were copied from previous compilation.
33+
0 functions were new in current compilation
34+
1 functions had inline decision re-evaluated but remain unchanged
35+
Finished generating code
36+
Astro8-Emulator.vcxproj -> D:\Code\Astro8-Computer\Astro8-Emulator\x64\Release\astro8.exe

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.res

15.2 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/Astro8-Emulator.lastbuildstate

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.40.33807:TargetPlatformVersion=10.0.22621.0:VcpkgTriplet=x64-windows:
2+
Release|x64|D:\Code\Astro8-Computer\Astro8-Emulator\|

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/CL.command.1.tlog

4.08 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/CL.read.1.tlog

81.3 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/CL.write.1.tlog

2.44 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/Cl.items.tlog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
D:\Code\Astro8-Computer\Astro8-Emulator\armstrong-compiler.cpp;D:\Code\Astro8-Computer\Astro8-Emulator\Astro8-Emulator\x64\Release\armstrong-compiler.obj
2+
D:\Code\Astro8-Computer\Astro8-Emulator\assembler.cpp;D:\Code\Astro8-Computer\Astro8-Emulator\Astro8-Emulator\x64\Release\assembler.obj
3+
D:\Code\Astro8-Computer\Astro8-Emulator\escapi.cpp;D:\Code\Astro8-Computer\Astro8-Emulator\Astro8-Emulator\x64\Release\escapi.obj
4+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp;D:\Code\Astro8-Computer\Astro8-Emulator\Astro8-Emulator\x64\Release\main.obj

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/CopyFile.command.1.tlog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
^D:\CODE\ASTRO8-COMPUTER\CHAR_SET_MEMTAPE
2+
D:\Code\Astro8-Computer\Astro8-Emulator\x64\Release\char_set_memtape

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/CopyFile.read.1.tlog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
^D:\CODE\ASTRO8-COMPUTER\CHAR_SET_MEMTAPE

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/CopyFile.write.1.tlog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
^D:\CODE\ASTRO8-COMPUTER\CHAR_SET_MEMTAPE
2+
D:\CODE\ASTRO8-COMPUTER\ASTRO8-EMULATOR\X64\RELEASE\CHAR_SET_MEMTAPE

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/link.command.1.tlog

3.44 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/link.read.1.tlog

5.66 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/link.secondary.1.tlog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
^D:\CODE\ASTRO8-COMPUTER\ASTRO8-EMULATOR\ASTRO8-EMULATOR\X64\RELEASE\ARMSTRONG-COMPILER.OBJ|D:\CODE\ASTRO8-COMPUTER\ASTRO8-EMULATOR\ASTRO8-EMULATOR\X64\RELEASE\ASSEMBLER.OBJ|D:\CODE\ASTRO8-COMPUTER\ASTRO8-EMULATOR\ASTRO8-EMULATOR\X64\RELEASE\ASTRO8-EMULATOR.RES|D:\CODE\ASTRO8-COMPUTER\ASTRO8-EMULATOR\ASTRO8-EMULATOR\X64\RELEASE\ESCAPI.OBJ|D:\CODE\ASTRO8-COMPUTER\ASTRO8-EMULATOR\ASTRO8-EMULATOR\X64\RELEASE\MAIN.OBJ
2+
D:\Code\Astro8-Computer\Astro8-Emulator\Astro8-Emulator\x64\Release\astro8.IPDB
3+
D:\Code\Astro8-Computer\Astro8-Emulator\Astro8-Emulator\x64\Release\astro8.iobj

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/link.write.1.tlog

1.07 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/rc.command.1.tlog

542 Bytes
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/rc.read.1.tlog

2.82 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/rc.write.1.tlog

302 Bytes
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/armstrong-compiler.obj

1.67 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/assembler.obj

1.73 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/astro8.exe.recipe

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<ProjectOutputs>
4+
<ProjectOutput>
5+
<FullPath>D:\Code\Astro8-Computer\Astro8-Emulator\x64\Release\astro8.exe</FullPath>
6+
</ProjectOutput>
7+
</ProjectOutputs>
8+
<ContentFiles />
9+
<SatelliteDlls />
10+
<NonRecipeFileRefs />
11+
</Project>

‎Astro8-Emulator/Astro8-Emulator/x64/Release/astro8.iobj

4.54 MB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/astro8.ipdb

1.53 MB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/escapi.obj

133 KB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/main.obj

3.73 MB
Binary file not shown.

‎Astro8-Emulator/Astro8-Emulator/x64/Release/vcpkg.applocal.log

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+


‎Astro8-Emulator/main.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ using namespace Generators;
3535

3636
#define DEV_MODE false
3737

38-
std::string VERSION = "Astro-8 VERSION: v3.4.0-alpha";
38+
std::string VERSION = "Astro-8 VERSION: v3.4.2-alpha";
3939

4040

4141
#if UNIX
@@ -430,8 +430,9 @@ int GenerateCharacterROM() {
430430

431431
int main(int argc, char** argv)
432432
{
433-
if (DEV_MODE)
433+
#if DEV_MODE
434434
verbose = true;
435+
#endif
435436

436437
// Fill the memory
437438
memoryBytes = vector<vector<uint16_t>>(6, vector<uint16_t>(65535, 0));
@@ -537,7 +538,7 @@ int main(int argc, char** argv)
537538

538539

539540
// Open and read the file from the path
540-
if (split(filePath, "\n")[0].find('/') != std::string::npos || split(filePath, "\n")[0].find('\\') != std::string::npos) {
541+
//if (split(filePath, "\n")[0].find('/') != std::string::npos || split(filePath, "\n")[0].find('\\') != std::string::npos) {
541542
std::string path = trim(split(filePath, "\n")[0]);
542543
path.erase(std::remove(path.begin(), path.end(), '\''), path.end()); // Remove all single quotes
543544
path.erase(std::remove(path.begin(), path.end(), '\"'), path.end()); // Remove all double quotes
@@ -564,14 +565,14 @@ int main(int argc, char** argv)
564565
projectDirectory = path.substr(0, path.find_last_of("/\\"));
565566
projectDirectory = std::filesystem::canonical(projectDirectory).string() + (WINDOWS ? "\\" : "/");
566567

567-
}
568+
/*}
568569
else if (argc != 1) {
569570
PrintColored("\nError: could not open file ", redFGColor, "");
570571
PrintColored("\"" + code + "\"\n", brightBlueFGColor, "");
571572
cout << "\n\nPress Enter to Exit...";
572573
cin.ignore();
573574
exit(1);
574-
}
575+
}*/
575576

576577

577578
// Determine if the file is an AstroExecutable - AEXE
@@ -904,8 +905,8 @@ int main(int argc, char** argv)
904905
std::string receivedPath;
905906
std::string receivedData;
906907
bool returningFileData = false;
907-
uint16_t fileData[65535];
908-
uint16_t fileIterator = 0;
908+
uint16_t fileData[65535*4];
909+
int fileIterator = 0;
909910
uint16_t fileLength = 0;
910911
ofstream outputProgramFileStream;
911912

@@ -1003,7 +1004,7 @@ int main(int argc, char** argv)
10031004
if (returningFileData) {
10041005
if (memoryBytes[1][53505] == 0) {
10051006
memoryBytes[1][53505] = fileData[fileIterator] | 0b100000000000000;
1006-
if (fileIterator >= 65535 || fileIterator >= fileLength) {
1007+
if (fileIterator >= fileLength) {
10071008
fileIterator = 0;
10081009
returningFileData = false;
10091010
memoryBytes[1][53505] = 4095;
@@ -1685,16 +1686,16 @@ void Update()
16851686
case LDLGE:
16861687
BankReg = arg & 0b111;
16871688
AReg = GetMem(BankReg, GetMem(0, programCounter));
1688-
programCounter++;
16891689
if (superVerbose)
16901690
cout << "ldlge change AReg to " << GetMem(0, programCounter) << endl;
1691+
programCounter++;
16911692
break;
16921693
case STLGE:
16931694
BankReg = arg & 0b111;
16941695
SetMem(BankReg, GetMem(0, programCounter), AReg);
1695-
programCounter++;
16961696
if (superVerbose)
16971697
cout << "stlge store AReg to " << GetMem(0, programCounter) << endl;
1698+
programCounter++;
16981699
break;
16991700
case LDW:
17001701
//AReg = memoryBytes[0][programCounter];

‎Astro8-Emulator/x64/Release/Astro8-Emulator.log

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
 armstrong-compiler.cpp
2-
assembler.cpp
3-
escapi.cpp
4-
main.cpp
1+
 main.cpp
52
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(68,13): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
63
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(131,24): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
74
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(132,24): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
@@ -32,7 +29,8 @@ D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(2902,28): warning C4244: '+=':
3229
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(2905,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
3330
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(3115,29): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
3431
Generating code
35-
Previous IPDB not found, fall back to full compilation.
36-
All 2193 functions were compiled because no usable IPDB/IOBJ from previous compilation was found.
32+
1 of 2193 functions (<0.1%) were compiled, the rest were copied from previous compilation.
33+
0 functions were new in current compilation
34+
0 functions had inline decision re-evaluated but remain unchanged
3735
Finished generating code
3836
Astro8-Emulator.vcxproj -> D:\Code\Astro8-Computer\Astro8-Emulator\x64\Release\astro8.exe

‎Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/CL.read.1.tlog

384 Bytes
Binary file not shown.

‎Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/CL.write.1.tlog

124 Bytes
Binary file not shown.

‎Astro8-Emulator/x64/Release/Astro8-Emulator.tlog/link.write.1.tlog

392 Bytes
Binary file not shown.

‎Astro8-Emulator/x64/Release/astro8.exe

5 KB
Binary file not shown.

‎Astro8-Emulator/x64/Release/astro8.iobj

12 Bytes
Binary file not shown.

‎Astro8-Emulator/x64/Release/astro8.ipdb

-1.04 MB
Binary file not shown.

‎Astro8-Emulator/x64/Release/astro8.pdb

96 KB
Binary file not shown.

‎Astro8-Emulator/x64/Release/main.obj

-54 Bytes
Binary file not shown.

‎Astro8-Emulator/x64/Release/vc143.pdb

8 KB
Binary file not shown.

0 commit comments

Comments
 (0)