Skip to content

Commit c27b8f1

Browse files
authored
Merge pull request #54 from sam-astro/high-res-test
High res test
2 parents 92faaac + f6d2f89 commit c27b8f1

Some content is hidden

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

49 files changed

+66772
-9470
lines changed
Binary file not shown.
Binary file not shown.

Astro8-Emulator/colorprint.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,10 @@ static void ColorAndPrintAssembly(std::string asmb, vector<std::string> instruct
207207
else {
208208
PrintColored(" !!", redFGColor, "");
209209
PrintColored("\t" + to_string(actualNum), yellowFGColor, "");
210-
PrintColored("\t" + nstr[i] + "\n", redFGColor, "");
210+
PrintColored("\t" + instruction + "\n", redFGColor, "");
211+
/*cout << "\n\nPress Enter to Exit...";
212+
cin.ignore();
213+
exit(1);*/
211214
}
212215

213216
actualNum++;

Astro8-Emulator/main.cpp

Lines changed: 474 additions & 207 deletions
Large diffs are not rendered by default.

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

Lines changed: 51 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,58 @@ D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(133,30): warning C4267: '='
66
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(134,30): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
77
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(135,29): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
88
D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(136,29): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
9-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(331,24): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
10-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(636,24): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
11-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(738,24): warning C5051: attribute 'likely' requires at least '/std:c++20'; ignored
12-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(756,10): warning C4244: '=': conversion from 'uint64_t' to 'int', possible loss of data
13-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(768,32): warning C5051: attribute 'unlikely' requires at least '/std:c++20'; ignored
14-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(899,5): warning C5051: attribute 'likely' requires at least '/std:c++20'; ignored
15-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(931,31): warning C4805: '==': unsafe mix of type 'int' and type 'bool' in operation
16-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(936,31): warning C4805: '==': unsafe mix of type 'int' and type 'bool' in operation
17-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(941,31): warning C4805: '==': unsafe mix of type 'int' and type 'bool' in operation
18-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(948,32): warning C5051: attribute 'unlikely' requires at least '/std:c++20'; ignored
19-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1062,45): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
20-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1062,32): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
21-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1662,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
22-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1665,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
23-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1668,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
24-
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1873,32): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
9+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(473,24): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
10+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(792,24): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
11+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(916,24): warning C5051: attribute 'likely' requires at least '/std:c++20'; ignored
12+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(934,10): warning C4244: '=': conversion from 'uint64_t' to 'int', possible loss of data
13+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(946,32): warning C5051: attribute 'unlikely' requires at least '/std:c++20'; ignored
14+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1077,5): warning C5051: attribute 'likely' requires at least '/std:c++20'; ignored
15+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1124,49): warning C4805: '==': unsafe mix of type 'int' and type 'bool' in operation
16+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1127,49): warning C4805: '==': unsafe mix of type 'int' and type 'bool' in operation
17+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1200,32): warning C5051: attribute 'unlikely' requires at least '/std:c++20'; ignored
18+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1314,45): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
19+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1314,32): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
20+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1919,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
21+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1922,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
22+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1925,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
23+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(2131,32): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
24+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(340,31): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
25+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(332): message : while compiling class template member function 'void PlaybackSpeedEffectHandler<float>::modifyStreamPlaybackSpeed(int,void *,int)'
26+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(397): message : see reference to function template instantiation 'void PlaybackSpeedEffectHandler<float>::modifyStreamPlaybackSpeed(int,void *,int)' being compiled
27+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(426): message : see reference to class template instantiation 'PlaybackSpeedEffectHandler<float>' being compiled
28+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(340,22): warning C4244: 'initializing': conversion from 'double' to 'const float', possible loss of data
29+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(353,25): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
30+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(353,18): warning C4244: 'initializing': conversion from 'float' to 'const int', possible loss of data
31+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(366,27): warning C4244: '=': conversion from 'float' to 'AudioFormatType', possible loss of data
32+
with
33+
[
34+
AudioFormatType=Sint32
35+
]
36+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(366,27): warning C4244: '=': conversion from 'float' to 'AudioFormatType', possible loss of data
37+
with
38+
[
39+
AudioFormatType=Sint16
40+
]
41+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(366,27): warning C4244: '=': conversion from 'float' to 'AudioFormatType', possible loss of data
42+
with
43+
[
44+
AudioFormatType=Uint16
45+
]
46+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(366,27): warning C4244: '=': conversion from 'float' to 'AudioFormatType', possible loss of data
47+
with
48+
[
49+
AudioFormatType=Sint8
50+
]
51+
D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(366,27): warning C4244: '=': conversion from 'float' to 'AudioFormatType', possible loss of data
52+
with
53+
[
54+
AudioFormatType=Uint8
55+
]
2556
Generating code
26-
1 of 1504 functions (<0.1%) were compiled, the rest were copied from previous compilation.
57+
1 of 1585 functions (<0.1%) were compiled, the rest were copied from previous compilation.
2758
0 functions were new in current compilation
28-
27 functions had inline decision re-evaluated but remain unchanged
59+
1 functions had inline decision re-evaluated but remain unchanged
2960
Finished generating code
61+
armstrong-compiler.obj : warning LNK4204: 'D:\Code\Astro8-Computer\Astro8-Emulator\x64\Release\vc143.pdb' is missing debugging information for referencing module; linking object as if no debug info
62+
assembler.obj : warning LNK4204: 'D:\Code\Astro8-Computer\Astro8-Emulator\x64\Release\vc143.pdb' is missing debugging information for referencing module; linking object as if no debug info
3063
Astro8-Emulator.vcxproj -> D:\Code\Astro8-Computer\Astro8-Emulator\x64\Release\astro8.exe
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 Bytes
Binary file not shown.
11.5 KB
Binary file not shown.
178 KB
Binary file not shown.
-376 KB
Binary file not shown.
104 KB
Binary file not shown.

Astro8-Emulator/x64/Release/high.wav

-8.66 KB
Binary file not shown.

0 commit comments

Comments
 (0)