Permalink
Browse files

name change

  • Loading branch information...
John Hankinson
John Hankinson committed May 20, 2017
1 parent 2dca094 commit 52c27dc4799be1304bf77e7f60bdd09e5de7f0e9
Showing with 110 additions and 110 deletions.
  1. +1 −1 H/coffspec.h
  2. +11 −11 H/dbgcv.h
  3. +1 −1 H/fastpass.h
  4. +7 −7 H/globals.h
  5. +1 −1 H/instravx.h
  6. +5 −5 H/instruct.h
  7. +5 −5 H/msgdef.h
  8. +4 −4 H/omfspec.h
  9. +1 −1 H/reswords.h
  10. +1 −1 H/symbols.h
  11. +1 −1 H/usage.h
  12. +1 −1 H/win32.h
  13. +1 −1 HJWasm.vcxproj
  14. +1 −1 README.md
  15. +1 −1 atofloat.c
  16. +1 −1 bin.c
  17. +1 −1 branch.c
  18. +17 −17 codegen.c
  19. +1 −1 coff.c
  20. +1 −1 condasm.c
  21. +2 −2 context.c
  22. +2 −2 data.c
  23. +1 −1 directiv.c
  24. +1 −1 errmsg.c
  25. +2 −2 expans.c
  26. +6 −6 expreval.c
  27. +2 −2 extern.c
  28. +3 −3 hll.c
  29. +1 −1 input.c
  30. +1 −1 listing.c
  31. +1 −1 main.c
  32. +2 −2 msgtext.c
  33. +2 −2 omf.c
  34. +1 −1 omffixup.c
  35. +1 −1 omfint.c
  36. +7 −7 parser.c
  37. +7 −7 proc.c
  38. +1 −1 reswords.c
  39. +1 −1 simsegm.c
  40. +2 −2 symbols.c
  41. +1 −1 trmem.c
@@ -1,5 +1,5 @@
/* the MS COFF declarations, as far as it's relevant for Hasm.
/* the MS COFF declarations, as far as it's relevant for Uasm.
* The full declarations can be found in MS PSDK, WinNT.h.
*/
@@ -1,6 +1,6 @@
/****************************************************************************
*
* This code is Public Domain. It's new for Hasm.
* This code is Public Domain. It's new for Uasm.
*
* ========================================================================
*
@@ -136,22 +136,22 @@ enum cv_attr_mprop {
enum cv4_leaf_indices {
CV4_LF_MODIFIER = 0x0001,
CV4_LF_POINTER = 0x0002, /* emitted by Hasm */
CV4_LF_ARRAY = 0x0003, /* emitted by Hasm */
CV4_LF_POINTER = 0x0002, /* emitted by Uasm */
CV4_LF_ARRAY = 0x0003, /* emitted by Uasm */
CV4_LF_CLASS = 0x0004,
CV4_LF_STRUCTURE = 0x0005, /* emitted by Hasm */
CV4_LF_UNION = 0x0006, /* emitted by Hasm */
CV4_LF_STRUCTURE = 0x0005, /* emitted by Uasm */
CV4_LF_UNION = 0x0006, /* emitted by Uasm */
CV4_LF_ENUM = 0x0007,
CV4_LF_PROCEDURE = 0x0008, /* not yet emitted by Hasm */
CV4_LF_PROCEDURE = 0x0008, /* not yet emitted by Uasm */
//CV4_LF_MFUNCTION = 0x0009,
//CV4_LF_VTSHAPE = 0x000A,
//CV4_LF_BARRAY = 0x000D,
CV4_LF_ARGLIST = 0x0201, /* not yet emitted by Hasm */
CV4_LF_FIELDLIST = 0x0204, /* emitted by Hasm */
CV4_LF_BITFIELD = 0x0206, /* emitted by Hasm */
CV4_LF_ARGLIST = 0x0201, /* not yet emitted by Uasm */
CV4_LF_FIELDLIST = 0x0204, /* emitted by Uasm */
CV4_LF_BITFIELD = 0x0206, /* emitted by Uasm */
CV4_LF_MEMBER = 0x0406, /* emitted by Hasm */
CV4_LF_MEMBER = 0x0406, /* emitted by Uasm */
};
enum cv5_leaf_indices {
@@ -179,7 +179,7 @@ enum cv8_leaf_indices {
enum cv_leaf_indices {
LF_MODIFIER = 0x0001,
LF_LABEL = 0x000E, /* emitted by Hasm */
LF_LABEL = 0x000E, /* emitted by Uasm */
#if CV_SIGNATURE==CV4_SIGNATURE
LF_POINTER = CV4_LF_POINTER,
LF_ARRAY = CV4_LF_ARRAY,
@@ -1,7 +1,7 @@
/* this is Public Domain.
fastpass.h defines structures and externals which are needed by the
"fast pass" feature. This feature speeds Hasm's assembly significantly
"fast pass" feature. This feature speeds Uasm's assembly significantly
if huge header files containing declarations and definitions are used
(as it is the case with Win32Inc and Masm32), since the header files are
then scanned in pass one only.
@@ -24,7 +24,7 @@
*
* ========================================================================
*
* Description: Hasm globals and limits.
* Description: Uasm globals and limits.
*
****************************************************************************/
@@ -204,15 +204,15 @@
#include "errmsg.h" /* must be located AFTER #defines lines */
#include "queue.h"
/* Hasm version info */
/* Uasm version info */
#ifdef _WIN64
#define _HASM_VERSION_STR_ "2.33"
#define _UASM_VERSION_STR_ "2.33"
#else
#define _HASM_VERSION_STR_ "2.33"
#define _UASM_VERSION_STR_ "2.33"
#endif
#define _HASM_VERSION_INT_ 233
#define _HASM_VERSION_SUFFIX_ "pre"
#define _HASM_VERSION_ _HASM_VERSION_STR_ //_HASM_VERSION_SUFFIX_
#define _UASM_VERSION_INT_ 233
#define _UASM_VERSION_SUFFIX_ "pre"
#define _UASM_VERSION_ _UASM_VERSION_STR_ //_UASM_VERSION_SUFFIX_
#if defined(_WIN32) || defined(_WIN64)
#define snprintf _snprintf
@@ -362,7 +362,7 @@ avxins(PSLLD, vpslld, P_AVX, VX_LL | VX_L | VX_DST | VX_HALF) /* -, d/s */
avxins(PSLLQ, vpsllq, P_AVX, VX_LL | VX_L | VX_DST | VX_HALF) /* -, d/s */
avxins(PSRAW, vpsraw, P_AVX, VX_LL | VX_L | VX_DST | VX_HALF) /* -, d/s */
avxins(PSRAD, vpsrad, P_AVX, VX_LL | VX_L | VX_DST | VX_HALF) /* -, d/s */
/* PSRAQ moved here for easyer handling, Hasm 2.16 */
/* PSRAQ moved here for easyer handling, Uasm 2.16 */
avxins(PSRAQ, vpsraq, P_AVX, VX_LL | VX_L | VX_DST | VX_HALF) /* -, d/s */
avxins(PSRLW, vpsrlw, P_AVX, VX_LL | VX_L | VX_DST | VX_HALF) /* -, d/s */
avxins(PSRLD, vpsrld, P_AVX, VX_LL | VX_L | VX_DST | VX_HALF) /* -, d/s */
@@ -109,7 +109,7 @@ insx(LOOPNEW,loopnew, OpCls( I8, NONE, NONE ), F_16A, 0, no_RM,
insx(LOOPNZW,loopnzw, OpCls( I8, NONE, NONE ), F_16A, 0, no_RM, 0xE0, 0x00, P_86, 0, RWF_IA32)
/* arith instructions. Masm v6 encodes operand types R,R differently
* (direction bit is NOT set). Hasm does like Masm v8+.
* (direction bit is NOT set). Uasm does like Masm v8+.
*/
#define ari( name, namelc, code, lock ) \
@@ -240,7 +240,7 @@ insn(RETW, 1, OpCls( NONE, NONE, NONE ), F_16, 0,
/* protected-mode instructions */
/* some (i.e. SMSW) also work with 32bit register as first operand, but Masm won't accept.
* to make Hasm accept, change OP_R16 to OP_RGT8
* to make Uasm accept, change OP_R16 to OP_RGT8
*/
ins (ARPL, arpl, OpCls( R16_M16, R16, NONE ), 0, 0, no_WDS, 0x63, 0x00, P_286, 0)
@@ -1013,7 +1013,7 @@ ins (PSRAD, psrad, OpCls( MMX, MMX_M64, NONE ), F_0F, 1, n
insn(PSRAD, 1, OpCls( MMX, I8_U, NONE ), F_0F, 0, no_WDS, 0x72, 0x20, P_586|P_MMX, QSIZE)
insn(PSRAD, 2, OpCls( XMM, I8_U, NONE ), F_660F, 0, no_WDS, 0x72, 0x20, P_686|P_SSE2,DSIZE|FV)
insn(PSRAD, 3, OpCls( XMM, XMM_M128, NONE ), F_660F, 1, no_WDS, 0xE2, 0x00, P_686|P_SSE2,DSIZE|T128)
/* PSRAQ moved here for easyer handling, Hasm 2.16 */
/* PSRAQ moved here for easyer handling, Uasm 2.16 */
//EVEX.NDD.128.66.0F.W1 72 /4 ib FVI VPSRAQ xmm1 {k1}{z}, xmm2/m128/m64bcst, imm8
ins(PSRAQ, psraq, OpCls( XMM, I8_U, NONE ), F_660F, 0, no_WDS, 0x72, 0x20, P_686|P_AVX,W1|IZSZ|QSIZE|FV)
insn(PSRAQ, 1, OpCls( XMM, XMM_M128, NONE ), F_660F, 1, no_WDS, 0xE2, 0x00, P_686|P_AVX,W1|QSIZE|T128)
@@ -1312,7 +1312,7 @@ ins(BNDSTX, bndstx, OpCls( MS, BND, NONE ), F_0F, 0,
#if 0
/* SSE4A (AMD only). */
/* disabled because INSERTQ needs 4 arguments, which Hasm cannot support currently */
/* disabled because INSERTQ needs 4 arguments, which Uasm cannot support currently */
ins (EXTRQ, extrq, OpCls( XMM, I8_U, I8_U ), F_660F, 0, no_WDS ,0x78, 0x00, P_686|P_SSE4, 0)
ins (INSERTQ, insertq, OpCls( XMM, XMM, I8_U ), F_F20F, 0, no_WDS ,0x78, 0x00, P_686|P_SSE4, 0)
ins (LZCNT, lzcnt, OpCls( RGT8, RGT8_MS, NONE ), F_F30F, 1, no_WDS ,0xBD, 0x00, P_686|P_SSE4, 0)
@@ -1741,7 +1741,7 @@ insx(VPRORD, vprord, OpCls( XMM, I8_U, NONE ), F_660F, 0, no
insx(VPRORVD, vprorvd, OpCls( XMM, XMM_M128, NONE ), F_660F38, 1, no_WDS,0x14, 0x00, P_686|P_AVX,IZSZ|DSIZE|FV,RWF_EVEX|RWF_VEX)
insx(VPRORQ, vprorq, OpCls( XMM, I8_U, NONE ), F_660F, 0, no_WDS,0x72, 0x01, P_686|P_AVX,W1|IZSZ|QSIZE|FV,RWF_EVEX|RWF_VEX)
insx(VPRORVQ, vprorvq, OpCls( XMM, XMM_M128, NONE ), F_660F38, 1, no_WDS,0x14, 0x00, P_686|P_AVX,W1|IZSZ|QSIZE|FV,RWF_EVEX|RWF_VEX)
/* moved to line 1016 for easyer handling Hasm 2.16 */
/* moved to line 1016 for easyer handling Uasm 2.16 */
//insx(VPSRAQ, vpsraq, OpCls( XMM, I8_U, NONE ), F_660F, 0, no_WDS,0x72, 0x20, P_686|P_AVX,W1|QSIZE|FV,RWF_EVEX|RWF_VEX|VX_DST)
//insn(VPSRAQ, 1, OpCls( XMM, XMM_M128, NONE ), F_660F, 1, no_WDS,0xE2, 0x00, P_686|P_AVX,W1|QSIZE|T128)
insx(VPSRAVD, vpsravd, OpCls( XMM, XMM_M128, NONE ), F_660F38, 1, no_WDS,0x46, 0x00, P_686|P_AVX,DSIZE|FV,RWF_EVEX|RWF_VEX)
@@ -6,10 +6,10 @@
* v2.06: Japanese texts removed.
* v2.07: listing texts moved to ltext.h
*/
pick( MSG_USAGE, "usage: Hasm [ options ] filelist [@env_var]\n" "Run \"Hasm -?\" or \"Hasm -h\" for more info\n" )
pick( MSG_USAGE, "usage: Uasm [ options ] filelist [@env_var]\n" "Run \"Uasm -?\" or \"Uasm -h\" for more info\n" )
pick( MSG_ASSEMBLY_RESULTS, "%s: %lu lines, %u passes, %u ms, %u warnings, %u errors" )
pick( MSG_HASM, "Hasm v" _HASM_VERSION_ ", " __DATE__ )
pick( MSG_HASM2, "Masm-compatible assembler.\n" "Portions Copyright (c) 1992-2002 Sybase, Inc. All Rights Reserved.\n" "Source code is available under the Sybase Open Watcom Public License.\n" )
pick( MSG_UASM, "Uasm v" _UASM_VERSION_ ", " __DATE__ )
pick( MSG_UASM2, "Masm-compatible assembler.\n" "Portions Copyright (c) 1992-2002 Sybase, Inc. All Rights Reserved.\n" "Source code is available under the Sybase Open Watcom Public License.\n" )
pick( MSG_ERROR_PREFIX, "Error" )
pick( MSG_WARNING_PREFIX, "Warning" )
pick( MSG_FATAL_PREFIX, "Fatal error" )
@@ -24,8 +24,8 @@ pick( TXT_CHARACTERISTICS, "characteristics" )
pick( TXT_ALIASNAME, "alias" ) /* v2.10: added */
/* error/warning message text constants */
pick(INVALID_COMBINATION_OF_OPCODE_AND_OPERANDS, "invalid combination of opcode and operands")/*Hasm v2.13: added */
pick(DECORATOR_OR_BRACE_EXPECTED, "decorator or brace expected") /*Hasm v2.13: added */
pick(INVALID_COMBINATION_OF_OPCODE_AND_OPERANDS, "invalid combination of opcode and operands")/*Uasm v2.13: added */
pick(DECORATOR_OR_BRACE_EXPECTED, "decorator or brace expected") /*Uasm v2.13: added */
pick(WRONG_MASK_REGISTER_NUBER, "wrong mask register number")
pick(TO_MANY_DECORATORS, "to many decorators")
pick(MISMATCH_IN_THE_NUMBER_OF_BROADCASTING_ELEMENTS, "mismatch in the number of broadcasting elements")
@@ -66,7 +66,7 @@ enum segdef_align_values {
/*
* INTEL Segment Combination Attributes - C field
* Hasm uses COMB_INVALID, COMB_ADDOFF, COMB_STACK & COMB_COMMON
* Uasm uses COMB_INVALID, COMB_ADDOFF, COMB_STACK & COMB_COMMON
*/
enum combine_attributes {
@@ -108,7 +108,7 @@ enum frame_methods {
/*
* INTEL Target Specifiers
* TARGET_ABS[WD] is supported for THREAD sub-records only, according to TIS OMF docs;
* Since Hasm won't write THREAD sub-records, those methods are invalid.
* Since Uasm won't write THREAD sub-records, those methods are invalid.
*/
enum target_methods {
TARGET_SEGWD = 0, /* segment index with displacement */
@@ -253,7 +253,7 @@ enum {
CMT_TNL = 0x40, /* no list bit */
};
/*
* Comment classes. Hasm uses:
* Comment classes. Uasm uses:
* - CMT_DOSSEG : dosseg directive
* - CMT_DEFAULT_LIBRARY : includelib directive
* - CMT_OMF_EXT : PROC's EXPORT attribute
@@ -308,7 +308,7 @@ enum omf_ext_subtype {
/*
* Linker directives ( CMT_LINKER_DIRECTIVE - mostly WLINK directives )
* Hasm uses LDIR_OPT_FAR_CALLS only
* Uasm uses LDIR_OPT_FAR_CALLS only
*/
enum linker_directives {
LDIR_SOURCE_LANGUAGE= 'D', /* dbg maj/min and source language */
@@ -51,7 +51,7 @@ struct ReservedWord {
uint_16 next; /* index next entry (used for hash table) */
uint_8 len; /* length of reserved word, i.e. 'AX' = 2 */
uint_8 flags; /* see enum reservedword_flags */
#if 0 /* __I86__ ( may be activated for HasmR, see reswords.c) */
#if 0 /* __I86__ ( may be activated for UasmR, see reswords.c) */
const char __based( void ) *name;
#else
const char *name; /* reserved word (char[]) */
@@ -59,7 +59,7 @@ enum sym_state {
/* v2.07: MT_ABS (0xC2) removed */
enum memtype {
/* 0x1F changed to 0x3F to cover ZMM registers, Hasm 2.16 */
/* 0x1F changed to 0x3F to cover ZMM registers, Uasm 2.16 */
MT_SIZE_MASK = 0x1F, /* if MT_SPECIAL==0 then bits 0-4 = size - 1 */
MT_FLOAT = 0x20, /* bit 5=1 */
MT_SIGNED = 0x40, /* bit 6=1 */
@@ -1,4 +1,4 @@
" Hasm [options] asm-file [options] [asm-file] ... [@env_var]\n\n\0"
" Uasm [options] asm-file [options] [asm-file] ... [@env_var]\n\n\0"
"options:\0"
#if AMD64_SUPPORT
"-<0|1|..|10>[p]\0" "Set CPU: 0=8086 (default), 1=80186, 2=80286, 3=80386,\0"
@@ -1,6 +1,6 @@
/*
* this file contains prototypes of the Win32 functions which are
* called directly by Hasm (in memalloc.c if FASTMEM=1).
* called directly by Uasm (in memalloc.c if FASTMEM=1).
*/
//#if defined(__WATCOMC__) || defined(__PCC__) || defined(__OCC__)
@@ -163,7 +163,7 @@
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<Keyword>ManagedCProj</Keyword>
<RootNamespace>HJWasm</RootNamespace>
<ProjectName>Hasm</ProjectName>
<ProjectName>UASM</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -1,4 +1,4 @@
![alt tag](http://www.terraspace.co.uk/gfx/hasm.png)
![alt tag](http://www.terraspace.co.uk/gfx/uasm.png)
---
@@ -88,7 +88,7 @@ void atofloat( void *out, const char *inp, unsigned size, bool negative, uint_8
break;
default:
/* sizes != 4,8 or 10 aren't accepted.
* Masm ignores silently, Hasm also unless -W4 is set.
* Masm ignores silently, Uasm also unless -W4 is set.
*/
if ( Parse_Pass == PASS_1 )
EmitWarn( 4, FP_INITIALIZER_IGNORED );
2 bin.c
@@ -184,7 +184,7 @@ static const struct IMAGE_PE_HEADER64 pe64def = {
#endif
#ifdef __I86__
/* "huge" fwrite() for Hasmr.exe */
/* "huge" fwrite() for Uasmr.exe */
uint_32 hfwrite( uint_8 huge *pBuffer, int size, uint_32 count, FILE *file )
/**************************************************************************/
{
@@ -301,7 +301,7 @@ ret_code process_branch( struct code_info *CodeInfo, unsigned CurrOpnd, const st
if( CodeInfo->token == T_CALL ) {
return( EmitError( CANNOT_USE_SHORT_WITH_CALL ) );
}
/* v1.96: since Hasm's backpatch strategy is to move from
/* v1.96: since Uasm's backpatch strategy is to move from
* "smallest" to "largest" distance, an "out of range"
* error can be detected at any time.
*/
Oops, something went wrong.

0 comments on commit 52c27dc

Please sign in to comment.