Commit Graph

Select branches

Hide Pull Requests

fix_per

lane_qasm_main

master

pea_bad_address_mode

sgq_work

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#63

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#8

#9

Mono Color

• f0859c8356 the assembler allows relative instructions (per, bra, etc) to external labels which won't link correctly. Merlin flags them as an error. fix_per Kelvin Sherlock 2024-12-02 20:16:39 -05:00
• 87f3803225 Did some more work, was crashing. Still fighting over Merlin32 bugs/oddities. I wish there was a way to have real Merlin assemble my test sources. sgq_work Shawn Quick 2023-06-18 16:32:38 -07:00
• c9170f9e8a some minor modes, pretty broken in rewriting regex expressions for parsing operands Shawn Quick 2023-02-18 17:44:34 -08:00
• 855add4427 this version is broken, working on RegEx to see if we can go faster Shawn Quick 2023-02-12 22:05:28 -08:00
• 51231c9336 make some design changes to evaluation and operand parsing Shawn Quick 2023-02-10 18:51:35 -08:00
• 0c5be8fc4d started a new working branch, so I don't push into master Shawn Quick 2023-02-09 14:28:19 -08:00
• e687507a3b now able to push all test scripts to a directory that can be shared with gsplus, and files directly loaded into Merlin. Also support 'CHK' p-op to compare assemblies between the two master Shawn Quick 2023-02-09 13:26:09 -08:00
• 6571f2de07 clean up/add to .gitignore Shawn Quick 2023-02-08 19:47:55 -08:00
• 20f78d128b more fixes on operand handling, tests back to passing (not all, but many) Shawn Quick 2023-02-08 15:46:38 -08:00
• 4380f4e8ca might be broken, work on addressing modes and shift operators < > | ^ Shawn Quick 2023-02-08 10:14:55 -08:00
• 88e0251a16 more options, cleanup of command line options Shawn Quick 2023-02-07 12:34:52 -08:00
• 107598bb02 working on parameters and options Shawn Quick 2023-02-06 22:27:19 -08:00
• 6e9eb6cfcc fixed a few bugs, got more tests to pass, added some parms.json options Shawn Quick 2023-02-05 21:38:02 -08:00
• 2f79abe461 work on cmake-tools under vscode, adding syntax checking, and script processing Shawn Quick 2023-02-05 10:49:07 -08:00
• 1fb1aa259d build ciderpress libraries with cmake Shawn Quick 2023-02-04 15:37:30 -08:00
• 9c66992c23 building ciderpress libraries with cmake Shawn Quick 2023-02-04 15:34:50 -08:00
• e74f463a1e Merge branch 'master' of github.com:marketideas/qasm Shawn Quick 2022-01-17 11:22:23 -08:00
• e1f1f662df libpal updates Shawn Quick 2022-01-17 11:21:57 -08:00
• 901ea90126
  Merge pull request #62 from marketideas/inc-a Lane Roathe 2021-08-31 15:14:33 -07:00
• fc62d0c9e7 'a' as an operand is ignored. Kelvin Sherlock 2021-08-31 18:08:08 -04:00
• 3f090b7b67 github authentication Shawn Quick 2021-08-20 08:35:37 -07:00
• a7b040e182
  Merge pull request #61 from ksherlock/qlink_ext Lane Roathe 2021-05-04 13:01:18 -07:00
• 8d65e4c290 link script ext support Kelvin Sherlock 2021-04-24 19:37:20 -04:00
• ba7a68c1bc
  Merge pull request #60 from ksherlock/len_pos Lane Roathe 2021-05-03 07:57:49 -07:00
• 59925b3a08 qlinkgs - implement the len/pos linker opcodes Kelvin Sherlock 2021-04-27 23:53:54 -04:00
• b6826d0df4
  Merge pull request #59 from ksherlock/rel_ds Lane Roathe 2021-04-27 15:54:33 -07:00
• b92683ed43 REL DS calculation is based on the total segment size, not the current file. additionally, it was block moving the size of the DS fill rather than the size of the relocation records. Kelvin Sherlock 2021-04-25 20:48:21 -04:00
• b1867bb1e3
  Merge pull request #58 from ksherlock/ovr_off Lane Roathe 2021-04-26 08:59:35 -07:00
• e7852a03a6
  Merge pull request #57 from ksherlock/link_badlabel_error2 Lane Roathe 2021-04-26 08:58:50 -07:00
• 1d23d8c76d
  Merge pull request #56 from ksherlock/export-gequ Lane Roathe 2021-04-26 08:57:51 -07:00
• c12743b943 OVR OFF was checking for 'F' instead of 'O'. Kelvin Sherlock 2021-04-25 20:41:23 -04:00
• b0fbd610c9 1. some, not all, badlable errors have bit $80 set (fatal indicator I believe). this is missing from the error table so they generate an undefined error. 2. error code isn't reloaded when checking for constraint/not resolved errors (which are handled specially), which would result in a second undefined error for them. Kelvin Sherlock 2021-04-24 21:04:58 -04:00
• f35e76b682 In Merlin, link script GEQU (and KBD) values are available to the assembler and the linker, as absolute values. Kelvin Sherlock 2021-04-23 23:38:25 -04:00
• bdbf17024e
  Merge pull request #55 from ksherlock/ext_abs Lane Roathe 2021-04-12 20:11:15 -07:00
• 2b9f5856d8 add test files for external abs Kelvin Sherlock 2021-04-12 20:53:57 -04:00
• 8216c6f489 linker was relocating absolute entries (ie xxx equ $1234 ; ent xxx). Kelvin Sherlock 2021-04-11 22:03:55 -04:00
• c9d2c39b5c
  Merge pull request #54 from ksherlock/new-test-cases Lane Roathe 2020-10-13 13:38:35 -07:00
• 7b8a81d605 add missing test cases for recent qasm iigs fixes. Kelvin Sherlock 2020-10-12 18:07:54 -04:00
• bdbf62fe36
  Merge pull request #53 from ksherlock/dw-star Lane Roathe 2020-10-12 08:46:02 -07:00
• 0fb0dc0cc1
  Merge pull request #52 from marketideas/pea_bad_address_mode Lane Roathe 2020-10-12 08:26:43 -07:00
• 4a380871cd ddb - update pcobjptr after each item. Kelvin Sherlock 2020-10-11 20:41:36 -04:00
• bc29319414 allow comma in quoted string during address check pea_bad_address_mode Kelvin Sherlock 2020-10-10 22:52:56 -04:00
• f7e30ea543
  Merge pull request #50 from ksherlock/pass-1-errors Lane Roathe 2020-06-08 09:44:50 -07:00
• 79a0748ede
  Merge pull request #49 from ksherlock/asm-listing Lane Roathe 2020-06-08 09:44:16 -07:00
• 8c94aa51c3 when an error is encountered in the first pass, print the line for better debugging. Previously, errors only printed the line on the second pass. Kelvin Sherlock 2020-06-06 18:03:54 -04:00
• f6408be2c0 tab to label column instead of using a space. This results in nicer output when line numbers increment in size (9 -> 10, 99 -> 110, etc) Kelvin Sherlock 2020-06-06 16:13:05 -04:00
• 0976282d81 update program counter (for eval purposes) after each argument in data statements. Kelvin Sherlock 2020-05-31 12:59:27 -04:00
• cacc4661ac
  Merge pull request #48 from ksherlock/linker-3-char-opcode marketideas 2020-05-30 11:09:07 -07:00
• 5ba4d043e5 merlin linker truncates opcodes to 3-characters. Kelvin Sherlock 2020-05-30 13:26:20 -04:00
• 300a0b7bcd
  Merge pull request #47 from ksherlock/inappropriate_intersegs Lane Roathe 2020-05-26 21:38:18 -07:00
• ca29613395 external, shifted references were always generating an interseg OMF relocation record even when in the same OMF segment (in which case they would reference segment 0 which is wrong). Kelvin Sherlock 2020-05-26 22:48:47 -04:00
• b5955278c3
  Merge pull request #46 from ksherlock/label-15-2 Lane Roathe 2020-05-25 23:10:59 -07:00
• 34ec484c67
  Merge pull request #45 from ksherlock/macro_quoted_strings Lane Roathe 2020-05-25 20:51:56 -07:00
• f6e5812894 a couple more linker label size adjustments. Kelvin Sherlock 2020-05-25 23:06:37 -04:00
• f5f3846a6d two more label length straglers Kelvin Sherlock 2020-05-25 18:32:17 -04:00
• b4bf2c1611 fix to macro operand parsing for quoted strings Kelvin Sherlock 2020-05-25 16:14:13 -04:00
• e743e2a6c4
  Merge pull request #44 from ksherlock/shell_fix_1 Lane Roathe 2020-05-24 21:21:51 -07:00
• 4b3caaf78f Don't try to do message center stuff when there was a message center error. Kelvin Sherlock 2020-05-24 22:45:17 -04:00
• 1f241d42c8 infinite loop parsing the command table file Kelvin Sherlock 2020-05-24 22:42:28 -04:00
• fb12ad70f7
  Merge pull request #43 from ksherlock/sym32 Lane Roathe 2020-05-24 16:18:58 -07:00
• 80839b641c
  Update src/data/sym.equates.S ds section with proper offset values Lane Roathe 2020-05-24 16:18:51 -07:00
• f8dd0bcc83
  Merge pull request #42 from ksherlock/nocrossbank Lane Roathe 2020-05-24 16:11:16 -07:00
• 89b7308c15 Update labels/symbol size from 15 to 31. Kelvin Sherlock 2020-05-24 18:37:21 -04:00
• 8f7427d11d symbol table needs to be no-cross-bank since qasm uses mvn to copy entries into it (mvn won't cross banks) Kelvin Sherlock 2020-05-24 14:21:30 -04:00
• 13473d448b
  Merge pull request #41 from ksherlock/ent-pass-two Lane Roathe 2020-01-16 10:35:33 -08:00
• 275f49e43e ent label-list operand should only execute on the second pass, after all labels are defined. Kelvin Sherlock 2020-01-15 21:00:16 -05:00
• 0dcd68a402
  Merge pull request #40 from ksherlock/quicklink-xy Lane Roathe 2020-01-14 17:53:18 -08:00
• 9c8abb1bb7 quick link was pulling x/y in the wrong order (when no subtype was specified). Kelvin Sherlock 2020-01-14 20:45:48 -05:00
• 938873e8f3
  Merge pull request #39 from lroathe/master Lane Roathe 2020-01-14 16:50:42 -08:00
• 0bedddc756 Remove broken links in project file, fix run to use relocated test file Lane Roathe 2020-01-14 16:49:48 -08:00
• 9f510117c0
  Merge pull request #38 from ksherlock/undo-illegal-address Lane Roathe 2020-01-13 19:18:10 -08:00
• cb60f13d67
  Merge pull request #37 from ksherlock/dot-s Lane Roathe 2020-01-13 19:14:02 -08:00
• da1c2e8222 adds back error checking which was previously disabled due to the illegal relative value bug. Kelvin Sherlock 2020-01-13 22:13:16 -05:00
• 861bb44d32 only add .S extension as necessary Kelvin Sherlock 2020-01-06 19:45:18 -05:00
• 77b01cbbb4
  Merge pull request #36 from ksherlock/dumdum Lane Roathe 2020-01-11 18:21:59 -08:00
• 93a79855fb reset dumor to 0, not $8000, at DEND. Kelvin Sherlock 2020-01-11 19:01:41 -05:00
• d119b7a08e
  Merge pull request #35 from ksherlock/y2k Lane Roathe 2020-01-07 12:18:46 -08:00
• 7336daffbf fix y2k overflow. Kelvin Sherlock 2020-01-06 19:44:51 -05:00
• 552603d2e0
  Merge pull request #34 from ksherlock/self-build Lane Roathe 2020-01-06 11:45:03 -08:00
• fa3554f6e5 missing macros :) Kelvin Sherlock 2020-01-05 23:56:11 -05:00
• a0bc5de359 assembler - use named tool macros Kelvin Sherlock 2020-01-05 19:10:27 -05:00
• 1fe4590e2c use tool macros instead of numbers. also use normal tool macro case Kelvin Sherlock 2020-01-05 18:52:06 -05:00
• 8d66e85d2c self-build linker. Kelvin Sherlock 2020-01-05 18:31:35 -05:00
• b45553c992 tweaks to self-compile qasm with qasm. Kelvin Sherlock 2020-01-05 18:02:01 -05:00
• 81a1e5a37d
  Merge pull request #32 from ksherlock/ksherlock-patch-3 Lane Roathe 2020-01-03 10:36:31 -08:00
• 700524b0f2
  (IIgs qasm) Add system 6.0 / System 6.0.1 macros ksherlock 2020-01-02 14:29:18 -05:00
• e47eb286b1
  Merge pull request #31 from marketideas/lane_qasm_main Lane Roathe 2020-01-01 14:49:42 -08:00
• 054aa2fbfc
  Merge pull request #30 from lroathe/master lane_qasm_main Lane Roathe 2020-01-01 14:49:22 -08:00
• 8a5c16feee Remove opcodes.h from project file list as it doesn't exist. Lane Roathe 2020-01-01 14:48:39 -08:00
• 2e27f6e785
  Merge pull request #29 from ksherlock/ksherlock-patch-2 Lane Roathe 2019-12-29 18:33:12 -08:00
• 05c76826c1
  Merge pull request #28 from ksherlock/ksherlock-patch-1 Lane Roathe 2019-12-28 11:32:38 -08:00
• 937c527344
  fix internal macro expansion ksherlock 2019-12-28 14:30:45 -05:00
• 92cffed07b
  stack imbalance printing the hours elapsed ksherlock 2019-12-27 22:25:42 -05:00
• a1ce717825
  Merge pull request #27 from ksherlock/usr_opcode Lane Roathe 2019-12-20 12:10:46 -08:00
• f0b10c0221 Add USR opcode. This uses the Merlin and QAsm opcode hashing scheme. Kelvin Sherlock 2019-12-19 20:02:41 -05:00
• 3e568ad47a
  Merge pull request #26 from marketideas/lane_qasm_main Lane Roathe 2019-12-11 10:38:38 -08:00
• 4e2d5fceb0
  Merge pull request #25 from lroathe/master Lane Roathe 2019-12-11 10:36:28 -08:00
• 1c863c1e81 Add note about ERR support to readme Lane Roathe 2019-12-11 10:35:39 -08:00
• 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 Lane Roathe 2019-12-03 12:09:44 -07:00
• 3c2d1c7a39 Get merlintests.sh working on my system Lane Roathe 2019-12-03 12:04:18 -07:00