Commit Graph

235 Commits

Author SHA1 Message Date
Kelvin Sherlock
861bb44d32 only add .S extension as necessary
modifies the asm command line, linker command line, and linker ASM/PUT/IF opcodes to only append a .S suffix if it's not already present.

this is more consistent with Merlin 16+ and less surprising for people who use the command-line asm or link commands.
2020-01-13 21:58:52 -05:00
Lane Roathe
77b01cbbb4
Merge pull request #36 from ksherlock/dumdum
reset dumor to 0, not $8000, at DEND. (qasm iigs)
2020-01-11 18:21:59 -08:00
Kelvin Sherlock
93a79855fb reset dumor to 0, not $8000, at DEND.
should fix a bug where DUM * (or DUM label) generates absolute values.
2020-01-11 19:01:41 -05:00
Lane Roathe
d119b7a08e
Merge pull request #35 from ksherlock/y2k
fix y2k dat display.
2020-01-07 12:18:46 -08:00
Kelvin Sherlock
7336daffbf fix y2k overflow.
_ReadTimeHex returns the year as an offset from 1900, so 2020 is 120, which overflows ('0' + 12 is ascii '<')

subtract 100, repeatedly, until it fits in 2 digits.  Should last into 2100.
2020-01-06 19:46:24 -05:00
Lane Roathe
552603d2e0
Merge pull request #34 from ksherlock/self-build
qasm/qlink IIgs Self build
2020-01-06 11:45:03 -08:00
Kelvin Sherlock
fa3554f6e5 missing macros :) 2020-01-05 23:56:11 -05:00
Kelvin Sherlock
a0bc5de359 assembler - use named tool macros 2020-01-05 19:11:28 -05:00
Kelvin Sherlock
1fe4590e2c use tool macros instead of numbers. also use normal tool macro case 2020-01-05 18:57:10 -05:00
Kelvin Sherlock
8d66e85d2c self-build linker.
will also build with merlin 16+, other than USR differences.
2020-01-05 18:31:35 -05:00
Kelvin Sherlock
b45553c992 tweaks to self-compile qasm with qasm.
other than USR opcode differences, it should build with merlin 16+ as well.
2020-01-05 18:06:32 -05:00
Lane Roathe
81a1e5a37d
Merge pull request #32 from ksherlock/ksherlock-patch-3
(IIgs qasm) Add system 6.0 / System 6.0.1 macros
2020-01-03 10:36:31 -08:00
ksherlock
700524b0f2
(IIgs qasm) Add system 6.0 / System 6.0.1 macros
I regenerated the pre-compiled toolmacs file based on GSBug's toolcall list (plus Marinetti toolcalls).

This includes new tools from system 6.0/6.01 and a a few name updates. The _DU is gone I don't know what that is offhand and I dare say nobody used it since it doesn't exist.
2020-01-02 14:29:18 -05:00
Lane Roathe
e47eb286b1
Merge pull request #31 from marketideas/lane_qasm_main
Lane qasm main
2020-01-01 14:49:42 -08:00
Lane Roathe
054aa2fbfc
Merge pull request #30 from lroathe/master
Remove opcodes.h from project file list as it doesn't exist.
2020-01-01 14:49:22 -08:00
Lane Roathe
8a5c16feee Remove opcodes.h from project file list as it doesn't exist. 2020-01-01 14:48:39 -08:00
Lane Roathe
2e27f6e785
Merge pull request #29 from ksherlock/ksherlock-patch-2
fix internal macro expansion
2019-12-29 18:33:12 -08:00
Lane Roathe
05c76826c1
Merge pull request #28 from ksherlock/ksherlock-patch-1
stack imbalance printing the hours elapsed
2019-12-28 11:32:38 -08:00
ksherlock
937c527344
fix internal macro expansion
I'm not sure why that line was commented out, but y has an undefined value at this point so it will read a random offset into the line.
2019-12-28 14:30:45 -05:00
ksherlock
92cffed07b
stack imbalance printing the hours elapsed
probably never noticed because no assembly ever took that long.
2019-12-27 22:25:42 -05:00
Lane Roathe
a1ce717825
Merge pull request #27 from ksherlock/usr_opcode
Add USR opcode.
2019-12-20 12:10:46 -08:00
Kelvin Sherlock
f0b10c0221 Add USR opcode. This uses the Merlin and QAsm opcode hashing scheme. 2019-12-19 20:05:49 -05:00
Lane Roathe
3e568ad47a
Merge pull request #26 from marketideas/lane_qasm_main
Lane qasm main
2019-12-11 10:38:38 -08:00
Lane Roathe
4e2d5fceb0
Merge pull request #25 from lroathe/master
Merge in latest work
2019-12-11 10:36:28 -08:00
Lane Roathe
1c863c1e81 Add note about ERR support to readme 2019-12-11 10:35:39 -08:00
Lane Roathe
60f7ef53d1 Remove redundant psuedo opcodes and move ops with non doPSEUDO handler to their own section to make it easier to find the ones we still need to implement 2019-12-03 12:09:44 -07:00
Lane Roathe
3c2d1c7a39 Get merlintests.sh working on my system 2019-12-03 12:04:18 -07:00
Lane Roathe
5e09e0ca2a
Merge pull request #24 from lroathe/master
Fix warnings
2019-12-03 08:46:31 -08:00
Lane Roathe
aa5069780c Fix some type conversion warnings 2019-12-03 09:44:50 -07:00
Lane Roathe
038d1004ea Merge branch 'master' of https://github.com/marketideas/qasm 2019-12-03 09:34:50 -07:00
Lane Roathe
d78c8612f9 Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm 2019-11-23 09:24:28 -08:00
marketideas
476a46d7db test 2019-11-22 09:33:24 -08:00
marketideas
9f57781cd9
Merge pull request #23 from marketideas/sgq_qasm_main
merged with macros working. Bug fixes in DO/IF/ELSE/FIN fixed. Better handling of DO OFF sections.
2019-11-21 21:02:39 -08:00
marketideas
279de5caa5 macro on last line bug fixed, nested macro defs 2019-11-21 21:00:26 -08:00
marketideas
b154efff36 fixes for nested DO/IF/ELSE/FIN 2019-11-21 19:20:59 -08:00
marketideas
133f885424
Merge pull request #22 from marketideas/sgq_qasm_main
macros with vars
2019-11-21 18:16:19 -08:00
marketideas
d86bd06e8e macros with vars now working 2019-11-21 18:14:30 -08:00
marketideas
21da3e7536 more macros and vars 2019-11-21 08:47:03 -08:00
marketideas
41fcc6451b
Merge pull request #21 from marketideas/sgq_qasm_main
Sgq qasm main
2019-11-21 04:54:26 -08:00
marketideas
c9febb19bd macros are defining/expanding - no ]vars 2019-11-21 04:53:10 -08:00
marketideas
e2203ca1d3 start of macro code 2019-11-20 21:50:00 -08:00
marketideas
0b8a9dfae4 more m32 compatibility tests 2019-11-20 18:36:29 -08:00
Lane Roathe
3cab17d7f5 Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm 2019-11-20 13:42:08 -08:00
marketideas
d65b01a882 more mods for testruns 2019-11-20 10:39:28 -08:00
marketideas
37ba8aaf40 more mods for testruns 2019-11-20 10:38:23 -08:00
marketideas
eba951f00f moving some test scripts around 2019-11-20 10:20:43 -08:00
marketideas
630ea66623 adding script to create M32 output files 2019-11-20 07:59:02 -08:00
Lane Roathe
810db2f286 Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm 2019-11-19 17:21:22 -08:00
marketideas
e2dd7ab645 test 2019-11-19 17:09:58 -08:00
marketideas
d3bc1455fa removed operand with spaces 2019-11-19 15:55:38 -08:00