82 Commits

Author SHA1 Message Date
Brent O'Neil
9e14467ccd Merge branch 'master' of https://github.com/simon987/Much-Assembly-Required into Interupts 2017-12-31 13:28:56 +11:00
Brent O'Neil
ab5810c585 Unhardcoded codeSegmentOffset and the hardware offset.
Changed Interrupt(int hw, int offset, boolean retry)
to	interrupt(boolean hw, int offset).
Removed no operand overload of int.
Added org_hwIVoddset to config.properties
2017-12-31 13:19:04 +11:00
Simon Fortier
cca68ba139
Merge pull request #69 from renpnal/patch-2
Fix typos
2017-12-30 20:00:25 -05:00
simon
83f05efff6 Support for color in hologram. Renamed classes: fixes #72 2017-12-30 19:58:47 -05:00
Jesse Nieminen
ea3b06c54c
Fix typos
Fixed typos in comments.
2017-12-30 23:52:06 +02:00
simon
1ed9e9e4db Fixed bug that sent console buffer to random players for real this time 2017-12-30 16:41:14 -05:00
simon
08f1aa8686 Fixed bug that sent console buffer to random players. 2017-12-30 16:29:39 -05:00
simon
55d4c19fe1 Added Console output, Cubots can receive data from ComPort, Fixed BOM being added to string literals, Fixed legs changing direction for free when energy < 100, Changed some log levels. 2017-12-30 15:30:44 -05:00
simon
2ef6f492c4 Fixes #64 2017-12-30 11:14:45 -05:00
simon
70a55dce59 Added features to Hologram hardware - Fixes #63 and #67 2017-12-30 11:03:09 -05:00
simon
fe0be03ab8 Fixes #68 & Reformatted code 2017-12-30 10:35:56 -05:00
simon
fd73a47796 Fixes #65 2017-12-30 10:30:18 -05:00
simon
9e402fe8a1 Fixed Radio Tower range 2017-12-29 22:36:52 -05:00
simon
ef7f573256 Added basic Radio Tower functionality #32
Keypress buffer is cleared on code upload
2017-12-29 21:49:42 -05:00
simon
5afa767b4a Fixed OF and CF flags being always set to false in the other function 2017-12-29 17:09:30 -05:00
simon
a9e580f2ce Fixed OF and CF flags being always set to false 2017-12-29 17:06:28 -05:00
Brent O'Neil
3db05478c1 Comments! 2017-12-30 08:54:23 +11:00
Brent O'Neil
974b00aa7a Renamed intr to iret to match 8086 mnemnonics 2017-12-30 08:29:53 +11:00
simon
017b89f97f Characters can be escaped in string literals 2017-12-29 14:35:26 -05:00
Simon Fortier
bd276e0a93
Merge pull request #60 from ScarySpider/More-Maven-fixes
More maven fixes
2017-12-29 13:48:56 -05:00
simon
72d43fccf7 Fixes #58 2017-12-29 13:39:13 -05:00
simon
18aaf91991 Fixed RET instruction that wouldn't assemble without any parameter 2017-12-29 13:09:47 -05:00
Jacob Swehla
bbcadbf253 Merge branch 'master' into More-Maven-fixes 2017-12-29 11:26:12 -06:00
Jacob Swehla
3d60f9a67c Merge remote-tracking branch 'upstream/master' 2017-12-29 11:25:55 -06:00
Jacob Swehla
b43cf9ac33 Moved config file and fixed some warnings 2017-12-29 11:25:31 -06:00
Brent O'Neil
ff4a3d6f20 Fixed some whitespace nonsense from a merge. 2017-12-30 03:07:28 +11:00
simon
293795b215 Fixes #55 and commas & semicolon can be inserted in string literals 2017-12-29 11:06:48 -05:00
Jacob Swehla
fde79ed97e Merge branch 'master' into More-Maven-fixes 2017-12-29 10:06:44 -06:00
Jacob Swehla
fcd339c315 Merge remote-tracking branch 'upstream/master' 2017-12-29 10:06:20 -06:00
Jacob Swehla
59e3e9430e Maven and file access
- Server config file is now accessed through the class loader
- Maven outputs server.jar, moves dependencys to adjacent /libs, and plugins to adjacent /plugins
2017-12-29 10:00:19 -06:00
Brent O'Neil
fedd4bb779 Merge branch 'master' of https://github.com/simon987/Much-Assembly-Required into Interupts 2017-12-30 02:10:14 +11:00
Brent O'Neil
1b18426c5c Added the Interupt (int <imm>) and Return from Interupt (intr) command.
Interupt pushes the flag register and the instruction pointer, then resets
execution to 0x0200 + (imm)*2.

Return from interupt pops the flags back and sets the ip. Returning execution
to the interupting code.

Implemented using a CPU hook that can be used to later implement interupts generated
from hardware, or for errors like divide by 0.
2017-12-30 02:02:18 +11:00
simon
45ec7191b4 Added string literals support for the assembler 2017-12-29 08:28:04 -05:00
simon
d9732557fc Removed unused files 2017-12-28 23:08:05 -05:00
Simon Fortier
729debb1a3
Fixes #56 2017-12-28 20:41:02 -05:00
simon
dab5cab602 Updated incorrect documentation 2017-12-28 19:29:48 -05:00
Jacob Swehla
c23ee0dc86 stuff 2017-12-28 17:02:41 -06:00
Jacob Swehla
9d184cb515 Merge remote-tracking branch 'upstream/master' 2017-12-28 16:41:05 -06:00
Jacob Swehla
09e00fd032 maven work 2017-12-28 16:40:53 -06:00
simon
8a980fec6a Very small modifications for keyboard hardware 2017-12-28 16:51:03 -05:00
simon
21ec4ae704 Cubot are now passable + Bug fixes 2017-12-28 13:34:11 -05:00
Simon Fortier
690b7e8d31
Merge pull request #47 from ScarySpider/Basic-Maven-fixes
Basic maven fixes
2017-12-28 09:57:03 -05:00
simon
d28ca387d0 Fixes ConcurrentModificationException errors 2017-12-28 09:17:31 -05:00
simon
f2b6387cc9 Fixes #50 2017-12-28 09:15:19 -05:00
simon
f3b20b3a2d Fixes #51 2017-12-28 08:43:13 -05:00
Cooper Harasyn
965ca91cb6 Modified "RET imm" to add imm + 1 to the SP instead of imm 2017-12-27 19:18:10 -05:00
Jacob Swehla
556f443ec2 Now outputs .jar files to /target
-Server jar outputs to /target/
-All other jars output to /target/plugins
2017-12-27 17:52:40 -06:00
Jacob Swehla
3158dd75ea Fixed Maven
Maven now builds correctly, may need further refinement.
2017-12-27 15:36:08 -06:00
Cooper Harasyn
3bd34bfcba Fixed typo in SubInstruction 2017-12-27 15:52:00 -05:00
simon
2e9248ea2e Factory Integration, NPC improvements. #19 & #31. 2017-12-24 14:26:19 -05:00