asl-current-142-bld174

Author: Alfred Arnold

Makefile.def-samples/Makefile.def-i686-w32-on-linux

@@ -4,8 +4,8 @@
 
 OBJDIR =
 CC = gcc
-CFLAGS = -g -O3 -fomit-frame-pointer -Wall -Wextra -Werror
-#CFLAGS = -g -O3 -fomit-frame-pointer -Wall -Wextra -Werror -ansi -std=c89 -pedantic
+CFLAGS = -g -O3 -fomit-frame-pointer -Wall -Wextra -Werror -Wstrict-prototypes
+#CFLAGS = -g -O3 -fomit-frame-pointer -Wall -Wextra -Werror -Wstrict-prototypes -ansi -std=c89 -pedantic
 HOST_OBJEXTENSION = .o
 LD = $(CC)
 LDFLAGS =

Makefile.def-samples/Makefile.def-x86_64-w32_w64-on-linux

@@ -6,7 +6,7 @@
 
 OBJDIR =
 CC = gcc
-CFLAGS = -g -O3 -fomit-frame-pointer -Wall -Wextra -Werror
+CFLAGS = -g -O3 -fomit-frame-pointer -Wall -Wextra -Werror -Wstrict-prototypes
 #CFLAGS = $(CFLAGS) -ansi -std=c89 -pedantic
 HOST_OBJEXTENSION = .o
 LDFLAGS =

as.c

@@ -2421,10 +2421,10 @@ static void SplitLine(void)
 
   /* Non-blank character in first column is always label: */
 
-  if ((pRun < pEnd) && (*pRun) && (!myisspace(*pRun)))
+  if ((pRun < pEnd) && (*pRun) && (!as_isspace(*pRun)))
   {
     for (pPos = pRun; pPos < pEnd; pPos++)
-      if ((myisspace(*pPos)) || (*pPos == ':'))
+      if ((as_isspace(*pPos)) || (*pPos == ':'))
         break;
     LabPart.Pos.StartCol = pRun - OneLine;
     if (pPos >= pEnd)
@@ -2447,8 +2447,8 @@ static void SplitLine(void)
 
   while (True)
   {
-    for (; (pRun < pEnd) && myisspace(*pRun); pRun++);
-    for (pPos = pRun; (pPos < pEnd) && !myisspace(*pPos); pPos++);
+    for (; (pRun < pEnd) && as_isspace(*pRun); pRun++);
+    for (pPos = pRun; (pPos < pEnd) && !as_isspace(*pPos); pPos++);
 
     /* If potential OpPart starts with argument divider,
        OpPart is empty and rest of line is all-arguments: */
@@ -2550,7 +2550,7 @@ static void SplitLine(void)
 
     while ((pRun < pEnd) || pActDivPos)
     {
-      while (*pRun && myisspace(*pRun))
+      while (*pRun && as_isspace(*pRun))
         pRun++;
       pDivPos = pEnd;
       for (pActDiv = DivideChars; *pActDiv; pActDiv++)
@@ -2609,7 +2609,7 @@ static void ProcessFile(String FileName)
     NextIncDepth = IncDepth;
 
     for (Run = OneLine; *Run != '\0'; Run++)
-      if (!isspace(((unsigned int) * Run) & 0xff))
+      if (!as_isspace(*Run))
         break;
     if (*Run == '#')
       Preprocess();
@@ -2856,7 +2856,6 @@ static void AssembleFile_ExitPass(void)
       pPhaseStacks[z] = pSavePhase->pNext;
       free(pSavePhase);
     }
-  TossRegDefs(-1);
   if (FirstIfSave)
     WrError(ErrNum_MissEndif);
   if (FirstSaveState)
@@ -3093,7 +3092,6 @@ static void AssembleFile(char *Name)
       CloseIfOpen(&LstFile);
       if (CodeOutput)
         unlink(OutName);
-      CleanupRegDefs();
       ClearCodepages();
       if (MakeUseList)
         ClearUseList();
@@ -3277,7 +3275,6 @@ static void AssembleFile(char *Name)
   /* Speicher freigeben */
 
   ClearSymbolList();
-  ClearRegDefs();
   ClearCodepages();
   ClearMacroList();
   ClearFunctionList();
@@ -4209,7 +4206,7 @@ int main(int argc, char **argv)
     case NoRedir:
       Env = getenv("USEANSI");
       strmaxcpy(Dummy, Env ? Env : "Y", STRINGSIZE);
-      if (mytoupper(Dummy[0]) == 'N')
+      if (as_toupper(Dummy[0]) == 'N')
       {
       }
       else

as.res

@@ -285,6 +285,22 @@ Message ErrMsgExpectInt
  "Ganzzahl erwartet"
  "expected integer"
 
+Message ErrMsgStringOrIntOrFloatButReg
+ "Ganz-, Gleitkommazahl oder String erwartet, aber Register bekommen"
+ "expected integer, floating point number or string but got register"
+
+Message ErrMsgExpectIntOrString
+ "Ganzzahl oder String erwartet"
+ "expected integer or string"
+
+Message ErrMsgExpectReg
+ "Register erwartet"
+ "expected register"
+
+Message ErrMsgRegWrongTarget
+ "Registersymbol für anderes Ziel"
+ "register symbol for different target"
+
 Message ErrMsgUnknownInstruction
  "unbekannter Befehl"
  "unknown instruction"
@@ -980,7 +996,7 @@ Message HeadingPageLab
 ; Strings in Listing
 
 Message ListSymListHead1
- "  Symboltabelle (*=unbenutzt):"
+ "  Symboltabelle (* = unbenutzt):"
  "  Symbol Table (* = unused):"
 
 Message ListSymListHead2
@@ -1004,12 +1020,12 @@ Message ListUSymSumsMsg
  " unused symbols"
 
 Message ListRegDefListHead1
- "  Registerdefinitionen (*=unbenutzt):"
- "  Register Definitions (*=unused):"
+ "  Registerdefinitionen (* = unbenutzt):"
+ "  Register Definitions (* = unused):"
 
 Message ListRegDefListHead2
  "  -----------------------------------"
- "  --------------------------------"
+ "  ----------------------------------"
 
 Message ListRegDefSumMsg
  " Definition"

asmallg.c

@@ -132,6 +132,8 @@ static void SetCPUCore(const tCPUDef *pCPUDef, const tStrComp *pCPUArgs)
   strmaxcpy(TmpCompStr, MomCPUIdentName, sizeof(TmpCompStr)); EnterStringSymbol(&TmpComp, MomCPUIdent, True);
 
   InternSymbol = Default_InternSymbol;
+  DissectBit = Default_DissectBit;
+  DissectReg = NULL;
   SetIsOccupiedFnc = NULL;
   DecodeAttrPart = NULL;
   SwitchIsOccupied = PageIsOccupied = False;
@@ -280,7 +282,6 @@ static void CodeENDSECTION(Word Index)
       CodeENDSECTION_ChkEmptList(&(Tmp->LocSyms));
       CodeENDSECTION_ChkEmptList(&(Tmp->GlobSyms));
       CodeENDSECTION_ChkEmptList(&(Tmp->ExportSyms));
-      TossRegDefs(MomSectionHandle);
       if (ArgCnt == 0)
         as_snprintf(ListLine, STRINGSIZE, "[%s]", GetSectionName(MomSectionHandle));
       SetMomSection(Tmp->Handle);
@@ -354,6 +355,9 @@ static void CodeSETEQU(Word MayChange)
           case TempString:
             EnterDynStringSymbolWithFlags(pName, &t.Contents.Ascii, MayChange, t.Flags);
             break;
+          case TempReg:
+            EnterRegSymbol(pName, &t.Contents.RegDescr, t.DataSize, MayChange, False);
+            break;
           default:
             break;
         }
@@ -363,6 +367,78 @@ static void CodeSETEQU(Word MayChange)
   }
 }
 
+static void CodeREGCore(const tStrComp *pNameArg, const tStrComp *pValueArg)
+{
+ if (InternSymbol)
+ {
+   TempResult t;
+
+   t.Typ = TempNone;
+   InternSymbol(pValueArg->Str, &t);
+   switch (t.Typ)
+   {
+     case TempReg:
+       goto Set;
+     case TempNone:
+     {
+       tEvalResult EvalResult;
+       tErrorNum ErrorNum;
+
+       ErrorNum = EvalStrRegExpressionWithResult(pValueArg, &t.Contents.RegDescr, &EvalResult);
+
+       switch (ErrorNum)
+       {
+         case ErrNum_SymbolUndef:
+           /* ignore undefined symbols in first pass */
+           if (PassNo <= MaxSymPass)
+           {
+             Repass = True;
+             return;
+           }
+           break;
+         case ErrNum_RegWrongTarget:
+           /* REG is architecture-agnostic */
+           EvalResult.OK = True;
+           break;
+         default:
+           break;
+       }
+
+       if (EvalResult.OK)
+       {
+         t.DataSize = EvalResult.DataSize;
+         goto Set;
+       }
+       else
+         WrStrErrorPos(ErrorNum, pValueArg);
+
+       break;
+     }
+     Set:
+       EnterRegSymbol(pNameArg, &t.Contents.RegDescr, t.DataSize, False, True);
+       break;
+     default:
+       WrStrErrorPos(ErrNum_ExpectReg, pValueArg);
+       return;
+   }
+ }
+}
+
+void CodeREG(Word Index)
+{
+  UNUSED(Index);
+
+  if (ChkArgCnt(1, 1))
+    CodeREGCore(&LabPart, &ArgStr[1]);
+}
+
+void CodeNAMEREG(Word Index)
+{
+  UNUSED(Index);
+
+  if (ChkArgCnt(2, 2))
+    CodeREGCore(&ArgStr[2], &ArgStr[1]);
+}
 
 static void CodeORG(Word Index)
 {
@@ -1862,7 +1938,7 @@ static void CodeSEGTYPE(Word Index)
   UNUSED(Index);
 
   if (ChkArgCnt(0, 0))
-    RelSegs = (mytoupper(*OpPart.Str) == 'R');
+    RelSegs = (as_toupper(*OpPart.Str) == 'R');
 }
 
 static void CodePPSyms(PForwardSymbol *Orig,

asmallg.h

@@ -24,6 +24,9 @@ extern void ClearONOFF(void);
 
 extern Boolean CodeGlobalPseudo(void);
 
+extern void CodeREG(Word Index);
+extern void CodeNAMEREG(Word Index);
+
 extern void INCLUDE_SearchCore(struct sStrComp *pDest, const struct sStrComp *pArg, Boolean SearchPath);
 
 extern void codeallg_init(void);

asmdef.c

@@ -141,6 +141,7 @@ void (*SwitchFrom)();
 void (*InternSymbol)();
 #endif
 DissectBitProc DissectBit;
+DissectRegProc DissectReg;
 
 StringPtr IncludeList;	                /* Suchpfade fuer Includedateien */
 Integer IncDepth, NextIncDepth;         /* Verschachtelungstiefe INCLUDEs */
@@ -323,6 +324,7 @@ void asmdef_init(void)
   SwitchFrom = NullProc;
   InternSymbol = Default_InternSymbol;
   DissectBit = Default_DissectBit;
+  DissectReg = NULL;
 
   SetMaxCodeLen(MaxCodeLen_Ini);
 

asmdef.h

@@ -35,6 +35,7 @@ typedef struct
       char *Contents;
       unsigned Length;
     } String;
+    tRegDescr RegDescr;
   } Contents;
 } SymbolVal;
 
@@ -332,6 +333,7 @@ extern Boolean (*IsDef)(void);
 extern void (*SwitchFrom)(void);
 extern void (*InternSymbol)(char *Asc, TempResult *Erg);
 extern DissectBitProc DissectBit;
+extern DissectRegProc DissectReg;
 
 extern StringPtr IncludeList;
 extern Integer IncDepth,NextIncDepth;

asmerr.c

@@ -292,6 +292,14 @@ static const char *ErrorNum2String(tErrorNum Num, char *Buf, int BufSize)
       msgno = Num_ErrMsgExpectString; break;
     case ErrNum_ExpectInt:
       msgno = Num_ErrMsgExpectInt; break;
+    case ErrNum_StringOrIntOrFloatButReg:
+      msgno = Num_ErrMsgStringOrIntOrFloatButReg; break;
+    case ErrNum_ExpectIntOrString:
+      msgno = Num_ErrMsgExpectIntOrString; break;
+    case ErrNum_ExpectReg:
+      msgno = Num_ErrMsgExpectReg; break;
+    case ErrNum_RegWrongTarget:
+      msgno = Num_ErrMsgRegWrongTarget; break;
     case ErrNum_NoRelocs:
       msgno = Num_ErrMsgNoRelocs; break;
     case ErrNum_UnresRelocs:

asmif.c

@@ -388,7 +388,7 @@ Boolean CodeIFs(void)
 
   ActiveIF = False;
 
-  switch (mytoupper(*OpPart.Str))
+  switch (as_toupper(*OpPart.Str))
   {
     case 'I':
       if (Memo("IF")) CodeIF();

asmmac.c

@@ -201,7 +201,7 @@ static Boolean ExpandDefines_NErl(char inp)
   return (((inp >= '0') && (inp <= '9')) || ((inp >= 'A') && (inp <= 'Z')) || ((inp >= 'a') && (inp <= 'z')));
 }
 
-#define t_toupper(ch) ((CaseSensitive) ? (ch) : (mytoupper(ch)))
+#define t_toupper(ch) ((CaseSensitive) ? (ch) : (as_toupper(ch)))
 
 void ExpandDefines(char *Line)
 {