merge 2.50

Author: john-terraspace

H/codegenv2.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "globals.h"
-#include "parser.h"
 #include "expreval.h"
 
 /* This order must remain as-is! */
@@ -178,10 +177,10 @@ enum op_type {
 #define VEX_WIG      (1<<1)		/* Instruction can use C5h(2byte) form (if no VEX.mmmmm) or VEX.W is ignored in C4H(3byte) form */
 #define VEX_W0       (1<<2)     /* VEX.W = 0, extended opcode bit, or promotion to 64bit of gp register or memory operand */
 #define VEX_W1       (1<<3)		/* "" */
-#define VEX_66		   (1<<4)
+#define VEX_66		 (1<<4)
 #define VEX_F2       (1<<5)
 #define VEX_F3       (1<<6)
-#define VEX_0F		   (1<<7)
+#define VEX_0F		 (1<<7)
 #define VEX_0F3A     (1<<8)
 #define VEX_0F38     (1<<9)
 #define VEX_LIG      (1<<10)
@@ -374,16 +373,16 @@ extern struct Instr_Def InstrTableV2[];
 
 /* Public functions */
 extern void     BuildInstructionTable(void);
-extern ret_code CodeGenV2(const char* instr, struct code_info* CodeInfo, uint_32 oldofs, uint_32 opCount, struct expr opExpr[4]);
+extern ret_code CodeGenV2(const char* instr, struct code_info *CodeInfo, uint_32 oldofs, uint_32 opCount, struct expr opExpr[4]);
 
 /* Private functions */
 enum op_type      DemoteOperand(enum op_type op);
 void              InsertInstruction(struct Instr_Def* pInstruction, uint_32 hash);
 struct Instr_Def* AllocInstruction();
 uint_32           GenerateInstrHash(struct Instr_Def* pInstruction);
 struct Instr_Def* LookupInstruction(struct Instr_Def* instr, bool memReg, unsigned char encodeMode, 
-	                                int srcRegNo, int dstRegNo, struct code_info* CodeInfo);
-enum op_type      MatchOperand(struct code_info* CodeInfo, struct opnd_item op, struct expr opExpr);
+	                                int srcRegNo, int dstRegNo, struct code_info *CodeInfo);
+enum op_type      MatchOperand(struct code_info *CodeInfo, struct opnd_item op, struct expr opExpr);
 
 bool Require_OPND_Size_Override(struct Instr_Def* instr, struct code_info* CodeInfo);
 bool Require_ADDR_Size_Override(struct Instr_Def* instr, struct code_info* CodeInfo);

H/fastpass.h

@@ -29,9 +29,7 @@ struct equ_item {
 
 struct line_item {
     struct line_item *next;
-    uint_32 lineno;
-    uint_32 srcfile;
-    uint_32 macro_level;
+    uint_32 lineno:20, srcfile:12;
     uint_32 list_pos; /* position .LST file */
     char line[1];
 };

H/globals.h

@@ -65,20 +65,6 @@
 
 #endif
 
-#if !(NOINCREASEDMAXLINELEN)
-#define MAX_LINE_LEN            25600  /* no restriction for this number */
-#define MAX_TOKEN  MAX_LINE_LEN - 32  /* max tokens in one line */
-#define MAX_STRING_LEN          MAX_LINE_LEN - 32 /* must be < MAX_LINE_LEN */
-#define MAX_ID_LEN              MAX_LINE_LEN - 32 /*247*/  /* must be < MAX_LINE_LEN */
-#define MAX_STRUCT_ALIGN        64
-#define MAX_SEGMENT_ALIGN       4096 /* maximum alignment/packing setting for segments */
-#define MAX_IF_NESTING          32 /* IFxx block nesting. Must be <=32, see condasm.c */
-#define MAX_SEG_NESTING         32 /* limit for segment nesting  */
-#define MAX_MACRO_NESTING       200 /* macro call nesting  */
-#define MAX_STRUCT_NESTING      32 /* limit for "anonymous structs" only */
-#define MAX_LNAME               255 /* OMF lnames - length must fit in 1 byte */
-#define LNAME_NULL              0   /* OMF first entry in lnames array */
-#else
 #define MAX_LINE_LEN            1024 /* no restriction for this number */
 #define MAX_TOKEN  MAX_LINE_LEN - 32 /* max tokens in one line */
 #define MAX_STRING_LEN          MAX_LINE_LEN - 32 /* must be < MAX_LINE_LEN */
@@ -91,7 +77,6 @@
 #define MAX_STRUCT_NESTING      32   /* limit for "anonymous structs" only */
 #define MAX_LNAME               255  /* OMF lnames - length must fit in 1 byte */
 #define LNAME_NULL              0    /* OMF first entry in lnames array */
-#endif
 
 /* output format switches */
 #ifndef BIN_SUPPORT
@@ -137,16 +122,12 @@
 #define AMD64_SUPPORT 1 /* 1=support 64bit */
 #endif
 
-#ifndef SYSV_SUPPORT
-#define SYSV_SUPPORT 1 /* 1=support 64bit */
-#endif
-
-#ifndef DELPHI_SUPPORT
-#define DELPHI_SUPPORT 1 /* 1=support 64bit */
+#ifndef SYSV_SUPPORT		
+#define SYSV_SUPPORT 1 /* 1=support 64bit */		
 #endif
 
-#ifndef REGCALL_SUPPORT
-#define REGCALL_SUPPORT 1 /* 1=support 64bit */
+#ifndef DELPHI_SUPPORT		
+#define DELPHI_SUPPORT 1 /* 1=support 64bit */		
 #endif
 
 #ifndef VMXSUPP
@@ -328,10 +309,8 @@ enum lang_type {
     LANG_BASIC      = 6,
     LANG_FASTCALL   = 7,
     LANG_VECTORCALL = 8,
-    LANG_SYSVCALL   = 9,
-    LANG_REGCALL	= 10,
-    LANG_THISCALL	= 11,
-	LANG_DELPHICALL = 12  // 
+	LANG_SYSVCALL   = 9,
+	LANG_DELPHICALL = 10
 };
 
 /* Memory model type.
@@ -517,23 +496,8 @@ enum stdcall_decoration {
 enum vectorcall_decoration
 {
 	VECTORCALL_FULL,
-	VECTORCALL_NONE
-};
-
-enum regcall_decoration
-{
-	REGCALL_FULL,
-	REGCALL_NONE
-};
-
-enum regcall_version
-{
-    RGCV_0,        
-    RGCV_1,     /* 1 */
-    RGCV_2,     /* 2 */
-    RGCV_3,     /* 3 */
-    RGCV_4,     /* 4 */
-    RGCV_5     /* 5 */
+	VECTORCALL_NONE,
+	VECTORCALL_HALF
 };
 
 struct qitem {
@@ -694,13 +658,11 @@ struct global_options {
 #endif
     bool        no_cdecl_decoration;     /* -zcw & -zcm option */
     uint_8      stdcall_decoration;      /* -zt<0|1|2> option */
-    uint_8      vectorcall_decoration;   /* -zv<0|1> option */
-    uint_8      regcall_decoration;      /* -ze<0|1> option */
-    uint_8      regcall_version;         /* -Ge<0|1|2|3|4|5> option  */
+	uint_8      vectorcall_decoration;   /* -zv<0|1|2> option */
     bool        no_export_decoration;    /* -zze option */
     bool        entry_decorated;         /* -zzs option  */
     bool        write_listing;           /* -Fl option  */
-    bool        dumpSymbols;             /* -Fs option  */
+	bool        dumpSymbols;             /* -Fs option  */
     bool        write_impdef;            /* -Fd option  */
     bool        case_sensitive;          /* -C<p|x|u> options */
     bool        convert_uppercase;       /* -C<p|x|u> options */
@@ -720,7 +682,7 @@ struct global_options {
     enum oformat output_format;          /* -bin, -omf, -coff, -elf options */
     enum sformat sub_format;             /* -mz, -pe, -win64, -elf64 options */
     uint_8      fieldalign;              /* -Zp option  */
-    enum lang_type langtype;             /* -G<c|d|r|z|v|y|e|t>   "Use Pascal, C, Fastcall, Stdcall, Vectorcall, SystemV, Regcall, Thiscall calling convention */
+    enum lang_type langtype;             /* -Gc|d|z option */
     enum model_type model;               /* -mt|s|m|c|l|h|f option */
     enum cpu_info cpu;                   /* -0|1|2|3|4|5|6 & -fp{0|2|3|5|6|c} option */
     enum fastcall_type fctype;           /* -zf0 & -zf1 option */

H/ltext.h

@@ -65,8 +65,6 @@ ltext(BASIC, "BASIC")
 ltext(FASTCALL, "FASTCALL")
 ltext(VECTORCALL, "VECTORCALL")
 ltext(SYSVCALL, "SYSVCALL")
-ltext(REGCALL, "REGCALL")
-ltext(THISCALL, "THISCALL")
 ltext(DELPHICALL, "DELPHICALL")
 
 ltext(TXT_MACROS, "Macros:")

H/memalloc.h

@@ -46,9 +46,7 @@ extern void MemFree( void *ptr );
 
 #elif defined(__GNUC__) || defined(__TINYC__)
 
-#ifndef alloca
 	#define alloca(x)  __builtin_alloca(x)
-#endif
 
 #define myalloca  alloca
 #ifndef __FreeBSD__  /* added v2.08 */

H/opndcls.h

@@ -236,10 +236,8 @@ OpCls(XMM, XMM_M128_M32, NONE ) //VGETEXPPS
 OpCls(XMM, XMM_M128_M64, NONE ) //VGETEXPPD
 OpCls(XMM, XMM,      XMM_M128 )
 OpCls( XMM,   R32_M32,   NONE )
-#if !INTELMOVQ
 OpCls( R32_M32,   XMM,   NONE )
 OpCls( R64_M64,   XMM,   NONE )
-#endif
 OpCls( XMM_M_ANY, XMM,   NONE )
 OpCls( R64,    XMM_M64,  NONE )
 OpCls( R32,    XMM_M64,  NONE )

H/special.h

@@ -385,8 +385,6 @@ res(FASTCALL, fastcall, RWT_RES_ID, 0, LANG_FASTCALL, 0, P_64, 0)
 res(VECTORCALL, vectorcall, RWT_RES_ID, 0, LANG_VECTORCALL, 0, P_64, 0)
 /* 2.24 system v and delphi 32 */
 res(SYSVCALL, systemv, RWT_RES_ID, 0, LANG_SYSVCALL, 0, P_64, 0)
-res(REGCALL, regcall, RWT_RES_ID, 0, LANG_REGCALL, 0, P_64, 0)
-res(THISCALL, thiscall, RWT_RES_ID, 0, LANG_THISCALL, 0, P_64, 0)
 res(BORLAND, borland, RWT_RES_ID, 0, LANG_DELPHICALL, 0, P_86, 0)
 /* 2.46.9 support VOID return type */
 res(VOIDARG,   voidarg,    RWT_RES_ID, 0, 0, 0, P_86, 0)

H/symbols.h

@@ -373,17 +373,12 @@ struct proc_info {
     unsigned            parasize;       /* total no. of bytes used by parameters */
     unsigned            localsize;      /* PROC: total no. of bytes used by local variables */
     unsigned            locals;
-    unsigned            vsize;
+    unsigned             vsize;
     char                *prologuearg;   /* PROC: prologuearg attribute */
     unsigned char       vecregs[6];
     unsigned char       vecregsize[6];
     unsigned char       vregs[6];
     unsigned char       xyzused[6];
-    unsigned            regcsize;
-    unsigned char       regcregs[16];
-    unsigned char       regcregsize[16];
-    unsigned char       rgcregs[16];
-    unsigned char       regcxyzused[16];
     unsigned char       delregsused[3]; /* added for delphi used registers v.29 */
     unsigned char       vecused;
 
@@ -404,11 +399,10 @@ struct proc_info {
     struct asym         *exc_handler;   /* PROC: exc handler set by FRAME */
     int                 ReservedStack;  /* PROC: win64: additional reserved stack */
     int                 stored_reg;     /* number of stored general registers in home spaces */
-    int                 pushed_reg;     /* number of pushed registers */
+    int					        pushed_reg;		  /* number of pushed registers */
     int                 home_taken;     /* number of taken spaces in a home space */
     int                 xmmsize;        /* size of saved xmm registers */
-	char                home_used[6];   /* used shadows home space */
-	char                regcallmshome_used[16];   /* used shadows home space */
+    char                home_used[6];   /* used shadows home space */
 #endif
     uint_32             prolog_list_pos;/* PROC: prologue list pos */
     union {

H/types.h

@@ -1,7 +1,7 @@
 
 /* prototypes of TYPES.C */
 
-#ifndef _TYPES_H_INCLUDED_
+#ifndef _TYPES_H_INCLUDED
 #define _TYPES_H_INCLUDED_
 
 /* qualified_type us used for parsing a qualified type. */

H/usage.h

@@ -28,7 +28,7 @@
 "-FPi87\0"          "80x87 instructions (default)\0"
 "-fpc\0"            "Disallow floating-point instructions (.NO87)\0"
 "-fp<n>\0"          "Set FPU, <n> is: 0=8087 (default), 2=80287, 3=80387\0"
-"-G<c|d|r|z|v|y|e|t>\0"   "Use Pascal, C, Fastcall, Stdcall, Vectorcall, SystemV, Regcall, Thiscall calling convention\0"
+"-G<c|d|r|z>\0"     "Use Pascal, C, Fastcall or Stdcall calling convention\0"
 "-I<directory>\0"   "Add directory to list of include directories\0"
 "-m<t|s|c|m|l|h|f>\0" "Set memory model:\0"
 "\0"                "(Tiny, Small, Compact, Medium, Large, Huge, Flat)\0"
@@ -76,9 +76,8 @@
 "-Zs\0"             "Perform syntax check only\0"
 "-zt<0|1|2>\0"      "Set STDCALL symbol decoration: 0=No name decoration,\0"
 "\0"                "1=No '@size' suffix for functions, 2=Full (default)\0"
-"-zv<0|1>\0"		"Set VECTORCALL symbol decoration: 0=No name decoration\0"
-"-ze<0|1>\0"		"Set REGCALL symbol decoration: 0=No name decoration\0"
-"-ge<0|1|2|3|4|5>\0" "Set REGCALL version number\0"
+"-zv<0|1|2>\0"      "Set VECTORCALL symbol decoration: 0=No name decoration,\0"
+"\0"                "1=No '@size' suffix for functions, 2=Full (default)\0"
 "-Zv8\0"            "Enable Masm v8+ PROC visibility\0"
 "-zze\0"            "No name decoration for exported symbols\0"
 #if COFF_SUPPORT