Skip to content

Commit aab9254

Browse files
Alfred Arnold0cjs
Alfred Arnold
authored and
0cjs
committed
asl-current-142-bld145
1 parent 85b3a54 commit aab9254

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+5842
-1101
lines changed

‎Makefile.dep

Lines changed: 114 additions & 110 deletions
Large diffs are not rendered by default.

‎as.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@
401401
#include "codeh8_5.h"
402402
#include "code7000.h"
403403
#include "code65.h"
404+
#include "codeh16.h"
404405
#include "code7700.h"
405406
#include "codehmcs400.h"
406407
#include "code4500.h"
@@ -4624,6 +4625,7 @@ int main(int argc, char **argv)
46244625
codeh8_5_init();
46254626
code7000_init();
46264627
code65_init();
4628+
codeh16_init();
46274629
code7700_init();
46284630
codehmcs400_init();
46294631
code4500_init();

‎as.res

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,10 @@ Message ErrMsgDoubleReg
434434
"Register mehr als einmal gelistet"
435435
"register(s) listed more than once"
436436

437+
Message ErrMsgRegBankMismatch
438+
"Register-Bank-Diskrepanz"
439+
"register bank mismatch"
440+
437441
Message ErrMsgNoSaveFrame
438442
"RESTORE ohne SAVE"
439443
"RESTORE without SAVE"

‎asmallg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1650,7 +1650,7 @@ static void CodeSTRUCT(Word IsUnion)
16501650
char ExtChar;
16511651
String StructName;
16521652

1653-
if (!ChkArgCnt(0, 1))
1653+
if (!ChkArgCnt(0, ArgCntMax))
16541654
return;
16551655

16561656
/* unnamed struct/union only allowed if embedded into at least one named struct/union */

‎asmitree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static void PNode(PInstTreeNode Node, Word Lev)
165165
if (Node)
166166
{
167167
PNode(Node->Left, Lev + 1);
168-
printf("%*s %s %p %p %d\n", 5 * Lev, "", Node->Name, Node->Left, Node->Right, Node->Balance);
168+
printf("%*s %s %p %p %d\n", 5 * Lev, "", Node->Name, (void*)Node->Left, (void*)Node->Right, Node->Balance);
169169
PNode(Node->Right, Lev + 1);
170170
}
171171
}

‎asmpars.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1598,7 +1598,6 @@ void EvalStrExpression(const tStrComp *pExpr, TempResult *pErg)
15981598
case TempString:
15991599
WrStrErrorPos(ErrNum_OpTypeMismatch, &CopyComp);
16001600
LEAVE;
1601-
break;
16021601
case TempInt:
16031602
TempResultToFloat(&InVals[z1]);
16041603
break;

‎asmpars.h

Lines changed: 2 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -6,69 +6,9 @@
66
/* */
77
/* Verwaltung von Symbolen und das ganze Drumherum... */
88
/* */
9-
/* Historie: 5. 5.1996 Grundsteinlegung */
10-
/* 26. 6.1998 Codepages */
11-
/* 16. 8.1998 NoICE-Symbolausgabe */
12-
/* 6.12.1998 UInt14 */
13-
/* 12. 7.1999 angefangen mit externen Symbolen */
14-
/* 21. 5.2000 added TmpSymCounter */
15-
/* 24. 5.2001 added UInt21 type */
16-
/* 3. 8.2001 added SInt6 type */
17-
/* 2001-10-20 added UInt23 */
18-
/* */
199
/*****************************************************************************/
20-
/* $Id: asmpars.h,v 1.12 2017/04/02 11:10:36 alfred Exp $ */
21-
/*****************************************************************************
22-
* $Log: asmpars.h,v $
23-
* Revision 1.12 2017/04/02 11:10:36 alfred
24-
* - allow more fine-grained macro expansion in listing
25-
*
26-
* Revision 1.11 2017/02/26 16:57:48 alfred
27-
* - make some arguments const
28-
*
29-
* Revision 1.10 2016/10/07 20:03:04 alfred
30-
* - make some arguments const
31-
*
32-
* Revision 1.9 2016/09/29 16:43:36 alfred
33-
* - introduce common DecodeDATA/DecodeRES functions
34-
*
35-
* Revision 1.8 2015/08/28 17:22:27 alfred
36-
* - add special handling for labels following BSR
37-
*
38-
* Revision 1.7 2014/11/30 10:09:54 alfred
39-
* - rework to current style
40-
*
41-
* Revision 1.6 2009/04/10 08:58:31 alfred
42-
* - correct address ranges for AVRs
43-
*
44-
* Revision 1.5 2008/11/23 10:39:16 alfred
45-
* - allow strings with NUL characters
46-
*
47-
* Revision 1.4 2005/10/02 10:00:44 alfred
48-
* - ConstLongInt gets default base, correct length check on KCPSM3 registers
49-
*
50-
* Revision 1.3 2004/05/30 20:51:43 alfred
51-
* - major cleanups in Const... functions
52-
*
53-
* Revision 1.2 2004/05/28 16:12:08 alfred
54-
* - added some const definitions
55-
*
56-
* Revision 1.1 2003/11/06 02:49:19 alfred
57-
* - recreated
58-
*
59-
* Revision 1.5 2003/02/26 19:18:26 alfred
60-
* - add/use EvalIntDisplacement()
61-
*
62-
* Revision 1.4 2002/10/07 20:25:01 alfred
63-
* - added '/' nameless temporary symbols
64-
*
65-
* Revision 1.3 2002/09/29 17:05:41 alfred
66-
* - ass +/- temporary symbols
67-
*
68-
* Revision 1.2 2002/05/19 13:44:52 alfred
69-
* - added ClearSectionUsage()
70-
*
71-
*****************************************************************************/
10+
11+
#include "symbolsize.h"
7212

7313
typedef enum
7414
{
@@ -118,21 +58,6 @@ typedef enum
11858
FloatTypeCnt
11959
} FloatType;
12060

121-
typedef enum
122-
{
123-
eSymbolSizeUnknown = -1,
124-
eSymbolSize8Bit = 0,
125-
eSymbolSize16Bit = 1,
126-
eSymbolSize32Bit = 2,
127-
eSymbolSize64Bit = 3,
128-
eSymbolSize80Bit = 4, /* Intel 80 Bit extended float */
129-
eSymbolSizeFloat32Bit = 5,
130-
eSymbolSizeFloat64Bit = 6,
131-
eSymbolSizeFloat96Bit = 7,
132-
eSymbolSize24Bit = 8,
133-
eSymbolSizeFloatDec96Bit = 9
134-
} tSymbolSize;
135-
13661
struct sStrComp;
13762
struct sRelocEntry;
13863

‎asmstructs.c

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,61 +5,6 @@
55
/* structure handling */
66
/* */
77
/*****************************************************************************/
8-
/* $Id: asmstructs.c,v 1.12 2016/09/22 15:36:15 alfred Exp $ */
9-
/*****************************************************************************
10-
* $Log: asmstructs.c,v $
11-
* Revision 1.12 2016/09/22 15:36:15 alfred
12-
* - use platform-dependent format string for LongInt
13-
*
14-
* Revision 1.11 2016/09/12 19:46:56 alfred
15-
* - initialize some elements in constructor
16-
*
17-
* Revision 1.10 2015/10/28 17:54:33 alfred
18-
* - allow substructures of same name in different structures
19-
*
20-
* Revision 1.9 2015/10/23 08:43:33 alfred
21-
* - beef up & fix structure handling
22-
*
23-
* Revision 1.8 2015/10/18 20:08:52 alfred
24-
* - when expanding structure, also regard sub-structures
25-
*
26-
* Revision 1.7 2015/10/18 19:02:16 alfred
27-
* - first reork/fix of nested structure handling
28-
*
29-
* Revision 1.6 2014/12/07 19:13:59 alfred
30-
* - silence a couple of Borland C related warnings and errors
31-
*
32-
* Revision 1.5 2014/12/05 11:09:10 alfred
33-
* - eliminate Nil
34-
*
35-
* Revision 1.4 2013-02-14 21:05:31 alfred
36-
* - add missing bookkeeping for expanded structs
37-
*
38-
* Revision 1.3 2004/01/17 16:18:38 alfred
39-
* - fix some more GCC 3.3 quarrel
40-
*
41-
* Revision 1.2 2004/01/17 16:12:50 alfred
42-
* - some quirks for GCC 3.3
43-
*
44-
* Revision 1.1 2003/11/06 02:49:19 alfred
45-
* - recreated
46-
*
47-
* Revision 1.6 2002/11/20 20:25:04 alfred
48-
* - added unions
49-
*
50-
* Revision 1.5 2002/11/16 20:50:02 alfred
51-
* - added expansion routine
52-
*
53-
* Revision 1.4 2002/11/15 23:30:31 alfred
54-
* - added search routine
55-
*
56-
* Revision 1.3 2002/11/11 21:56:57 alfred
57-
* - store/display struct elements
58-
*
59-
* Revision 1.2 2002/11/11 21:12:32 alfred
60-
* - first working edition
61-
*
62-
*****************************************************************************/
638

649
#include "stdinc.h"
6510
#include <string.h>
@@ -70,6 +15,7 @@
7015

7116
#include "trees.h"
7217
#include "errmsg.h"
18+
#include "symbolsize.h"
7319

7420
#include "as.h"
7521
#include "asmdef.h"
@@ -442,7 +388,7 @@ static void PrintDef(PTree Tree, void *pData)
442388
strmaxcat(s, NumStr2, STRINGSIZE);
443389
if (Elem->OpSize != eSymbolSizeUnknown)
444390
{
445-
sprintf(NumStr, "(%d)", Elem->OpSize);
391+
sprintf(NumStr, "(%s)", GetSymbolSizeName(Elem->OpSize));
446392
strmaxcat(s, NumStr, STRINGSIZE);
447393
}
448394
else

‎asmsub.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,6 +1375,8 @@ void WrXErrorPos(Word Num, const char *pExtendError, const struct sLineComp *pLi
13751375
msgno = Num_ErrMsgInvReg; break;
13761376
case ErrNum_DoubleReg:
13771377
msgno = Num_ErrMsgDoubleReg; break;
1378+
case ErrNum_RegBankMismatch:
1379+
msgno = Num_ErrMsgRegBankMismatch; break;
13781380
case ErrNum_NoSaveFrame:
13791381
msgno = Num_ErrMsgNoSaveFrame; break;
13801382
case ErrNum_NoRestoreFrame:

‎changelog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2019-03-09 [1.42 Bld 145]
2+
3+
- Bugfix : correct argument count check for STRUCT
4+
- Addition : Added Hitachi H16 target
5+
- Addition : allow displacement/address length override on TLCS-900
6+
- Bugfix : regard phase errors in data disposition instructions
7+
- Addition : add Commodore/CSG 65CE02 target
8+
19
2019-02-15 [1.42 Bld 144]
210

311
- Bugfix : correct/augment addressing modes for TLCS-900

0 commit comments

Comments
 (0)