Commit Graph

Select branches

Hide Pull Requests

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

#7

#8

#9

Mono Color

• 3e568ad47a
  Merge pull request #26 from marketideas/lane_qasm_main Lane Roathe 2019-12-11 10:38:38 -0800
• 4e2d5fceb0
  Merge pull request #25 from lroathe/master Lane Roathe 2019-12-11 10:36:28 -0800
• 1c863c1e81 Add note about ERR support to readme Lane Roathe 2019-12-11 10:35:39 -0800
• 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 -0700
• 3c2d1c7a39 Get merlintests.sh working on my system Lane Roathe 2019-12-03 12:04:18 -0700
• 5e09e0ca2a
  Merge pull request #24 from lroathe/master Lane Roathe 2019-12-03 08:46:31 -0800
• aa5069780c Fix some type conversion warnings Lane Roathe 2019-12-03 09:44:50 -0700
• 038d1004ea Merge branch 'master' of https://github.com/marketideas/qasm Lane Roathe 2019-12-03 09:34:50 -0700
• d78c8612f9 Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm Lane Roathe 2019-11-23 09:24:28 -0800
• 476a46d7db test marketideas 2019-11-22 09:33:24 -0800
• 9f57781cd9
  Merge pull request #23 from marketideas/sgq_qasm_main marketideas 2019-11-21 21:02:39 -0800
• 279de5caa5 macro on last line bug fixed, nested macro defs marketideas 2019-11-21 21:00:26 -0800
• b154efff36 fixes for nested DO/IF/ELSE/FIN marketideas 2019-11-21 19:20:59 -0800
• 133f885424
  Merge pull request #22 from marketideas/sgq_qasm_main marketideas 2019-11-21 18:16:19 -0800
• d86bd06e8e macros with vars now working marketideas 2019-11-21 18:14:30 -0800
• 21da3e7536 more macros and vars marketideas 2019-11-21 08:47:03 -0800
• 41fcc6451b
  Merge pull request #21 from marketideas/sgq_qasm_main marketideas 2019-11-21 04:54:26 -0800
• c9febb19bd macros are defining/expanding - no ]vars marketideas 2019-11-21 04:53:10 -0800
• e2203ca1d3 start of macro code marketideas 2019-11-20 21:50:00 -0800
• 0b8a9dfae4 more m32 compatibility tests marketideas 2019-11-20 18:36:29 -0800
• 3cab17d7f5 Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm Lane Roathe 2019-11-20 13:42:08 -0800
• d65b01a882 more mods for testruns marketideas 2019-11-20 10:39:28 -0800
• 37ba8aaf40 more mods for testruns marketideas 2019-11-20 10:38:23 -0800
• eba951f00f moving some test scripts around marketideas 2019-11-20 10:20:43 -0800
• 630ea66623 adding script to create M32 output files marketideas 2019-11-20 07:59:02 -0800
• 810db2f286 Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm Lane Roathe 2019-11-19 17:21:22 -0800
• e2dd7ab645 test marketideas 2019-11-19 17:09:58 -0800
• d3bc1455fa removed operand with spaces marketideas 2019-11-19 15:55:38 -0800
• 661de97c2c
  Merge pull request #20 from marketideas/sgq_qasm_main marketideas 2019-11-19 13:45:40 -0800
• 4781b693aa update README marketideas 2019-11-19 13:45:12 -0800
• 2ebeb0914c work on <>|^ operators to match M32 marketideas 2019-11-19 13:41:27 -0800
• d30965d72d
  Merge pull request #19 from marketideas/sgq_qasm_main marketideas 2019-11-19 12:08:31 -0800
• 7534c45def ]var EQU does an eval first and updates the variable to the resulting hex value marketideas 2019-11-19 12:06:08 -0800
• 2e6f8af54e all tests assemble, ]vars seem to be working marketideas 2019-11-19 11:27:17 -0800
• 4fa1c51549 added --syntax option marketideas 2019-11-19 09:59:03 -0800
• 572bdd5879 just a few more parser fixes marketideas 2019-11-19 09:22:27 -0800
• 3ad9f76075
  Merge pull request #18 from marketideas/sgq_qasm_main marketideas 2019-11-19 08:40:45 -0800
• b391c9b729 parser regex complete marketideas 2019-11-19 08:38:49 -0800
• dd7dcb4082 use regEx in parser to better handle strings marketideas 2019-11-18 22:29:06 -0800
• e4548bf453
  Merge pull request #17 from lroathe/master Lane Roathe 2019-11-18 12:46:38 -0800
• ae6f8244b8 Fix DCI handling Lane Roathe 2019-11-18 12:45:52 -0800
• 527620de2e Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm Lane Roathe 2019-11-18 12:03:43 -0800
• 0a5f52a2d0 test marketideas 2019-11-18 11:34:20 -0800
• 3fd0c7bcb5 test marketideas 2019-11-18 06:07:44 -0800
• a80ff4a35c making tests pass marketideas 2019-11-18 04:50:02 -0800
• a68c741800
  Merge pull request #16 from lroathe/master Lane Roathe 2019-11-17 22:29:56 -0800
• 77c75e94e4
  Merge pull request #15 from lroathe/master Lane Roathe 2019-11-17 22:27:54 -0800
• 97cc51e33e Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm Lane Roathe 2019-11-17 22:20:34 -0800
• 1c7a91e5eb test marketideas 2019-11-17 22:16:00 -0800
• ad163f5579
  Merge pull request #14 from lroathe/master Lane Roathe 2019-11-17 20:26:15 -0800
• 79c0cbf7ce Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm Lane Roathe 2019-11-17 20:23:11 -0800
• 09482611cf test marketideas 2019-11-17 19:54:48 -0800
• 3286572aa7 test marketideas 2019-11-17 19:05:50 -0800
• 065a247cc2 test marketideas 2019-11-17 18:46:49 -0800
• 27b76264b6 test marketideas 2019-11-17 18:18:50 -0800
• f83906fe16 test marketideas 2019-11-17 18:16:39 -0800
• f2addba16b test marketideas 2019-11-17 18:09:44 -0800
• ed6867cc3d
  Merge pull request #13 from lroathe/master Lane Roathe 2019-11-17 17:47:27 -0800
• 371317ba18 Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm Lane Roathe 2019-11-17 17:46:27 -0800
• c4096ee19d
  Merge pull request #12 from lroathe/master Lane Roathe 2019-11-17 17:45:09 -0800
• b56c09dc58 ASC psuedo opcode is working Lane Roathe 2019-11-17 17:41:42 -0800
• f8c793ead2 more work on runtests marketideas 2019-11-17 17:01:59 -0800
• 60bc85a823
  Merge pull request #11 from lroathe/master Lane Roathe 2019-11-17 16:16:45 -0800
• 7733b41076 test marketideas 2019-11-17 16:14:52 -0800
• 1a7193c4d5 Fix HEX opcode (line.operand_expr to line.operand) and move hex char eval code to a routine in anticipation of using for ASC parsing Lane Roathe 2019-11-17 16:14:01 -0800
• 8ae6f0ba3c Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm Lane Roathe 2019-11-17 15:04:20 -0800
• f639c41946 test updates marketideas 2019-11-17 14:26:06 -0800
• 0bea0d2254 working on testdata tests marketideas 2019-11-17 14:15:45 -0800
• dcd12630af test marketideas 2019-11-17 13:32:32 -0800
• 988e4b1f62 test marketideas 2019-11-17 12:17:28 -0800
• c4df28c63a
  Merge pull request #10 from lroathe/master Lane Roathe 2019-11-17 11:42:58 -0800
• 828675483a Silence warning about 64 to 32 bit conversion Lane Roathe 2019-11-17 11:42:16 -0800
• f7f877af71
  Merge pull request #9 from lroathe/master Lane Roathe 2019-11-17 11:24:12 -0800
• 1cfe6ebbbf Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm Lane Roathe 2019-11-17 11:19:42 -0800
• df8c9ef7d3 Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm Lane Roathe 2019-11-17 11:18:23 -0800
• 18c6987d34 test marketideas 2019-11-17 08:02:55 -0800
• 9009f5a222 test marketideas 2019-11-16 22:48:24 -0800
• 5e2fdd7b78 debug and release builds in Makefile marketideas 2019-11-16 21:18:52 -0800
• 671e8ac4da
  Merge pull request #8 from marketideas/sgq_qasm_main marketideas 2019-11-16 21:08:09 -0800
• 3b92d28f18 fixed formatter marketideas 2019-11-16 21:06:29 -0800
• 046335d9db fixed formatter marketideas 2019-11-16 21:03:19 -0800
• b1eeb0a648 DUP/IF/OPCODES/LST marketideas 2019-11-16 20:48:25 -0800
• 140121f13e opcodes working again marketideas 2019-11-16 20:39:09 -0800
• 6664a3e103 if/else/fin and some lst work marketideas 2019-11-16 19:33:22 -0800
• 02bdd29e79 test marketideas 2019-11-16 18:27:19 -0800
• 96ae01d615 test marketideas 2019-11-16 17:36:22 -0800
• a6d239f87a test marketideas 2019-11-16 11:14:51 -0800
• 022eaa0438 test marketideas 2019-11-16 10:48:01 -0800
• 568c09b91e test marketideas 2019-11-16 09:27:24 -0800
• fe34518911 test marketideas 2019-11-15 22:27:43 -0800
• a8030744bc test marketideas 2019-11-15 18:51:30 -0800
• 5c3dddd948 test marketideas 2019-11-15 18:40:12 -0800
• 6df441dd46 SGQ merge marketideas 2019-11-15 18:39:05 -0800
• 367be31104 test marketideas 2019-11-15 18:30:12 -0800
• b208c4bd41
  Merge pull request #6 from lroathe/master Lane Roathe 2019-11-15 18:10:11 -0800
• 429131b738 Upgrade Xcode project Lane Roathe 2019-11-15 18:08:42 -0800
• 05216d2058 Upgrade Xcode project Lane Roathe 2019-11-15 18:08:29 -0800
• ac3517fc69 Support UNUSED and put inttypes.h into system search pattern Lane Roathe 2019-11-15 18:08:15 -0800
• 8e4d6986fc Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm Lane Roathe 2019-11-15 17:59:27 -0800
• 5037c89a37 test marketideas 2019-11-15 16:15:58 -0800