Commit Graph

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