Merge remote-tracking branch 'upstream/master' into something_to_pull2

2017-02-13 21:38:38 +01:00
parent 38451fa8a4 287c5d6cd3
commit a5fba551d1
23 changed files with 1655 additions and 546 deletions
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -650,7 +650,7 @@ static const struct {
        { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
        { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
        { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
-        { "BRK",  0x0000001, 0x00, 0, PutAll },
+        { "BRK",  0x0000005, 0x00, 0, PutAll },
        { "BRL",  0x0040000, 0x82, 0, PutPCRel16 },
        { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
        { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -297,7 +297,11 @@ static void SetSys (const char* Sys)

        case TGT_ATMOS:
            NewSymbol ("__ATMOS__", 1);
-            break;
+            break; 
+
+        case TGT_TELESTRAT:
+             NewSymbol ("__TELESTRAT__", 1);
+             break;

        case TGT_NES:
            NewSymbol ("__NES__", 1);