Skip to content

Commit 054b425

Browse files
jmalakjmalak
committed
Revert "dwarf-dw: correct mistake"
This reverts commit a168230.
1 parent a168230 commit 054b425

31 files changed

Lines changed: 215 additions & 226 deletions

‎bld/browser/dlgprs/cpp/main.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@
4040
Dialog * CurrDialog = NULL;
4141
Binding * CurrBinding = NULL;
4242

43-
int main( int argc, char * argv[] )
44-
{
45-
try {
43+
int main( int argc, char * argv[] ) {
4644

45+
try {
46+
4747
if( argc != 5 ) {
4848
printf( "Usage: prsdlg <dlg file> <bnd file> <output header> <output source>\n" );
4949
return 0;
5050
}
51-
51+
5252
DialogParser dlgparse( argv[1] );
5353
dlgparse.yyparse();
54-
54+
5555
if( CurrDialog != NULL ) {
5656
BindingParser bndparse( argv[2] );
5757
bndparse.yyparse();
@@ -62,7 +62,7 @@ int main( int argc, char * argv[] )
6262

6363
} catch( FileExcept oops ) {
6464
static const char * act[] = { "open", "close", "read", "write", "seek", "tell", "stat" };
65-
65+
6666
printf( "Error %sing %s: %d -- %s\n", act[ oops._action ], oops._fileName, oops._error, oops._message );
6767
}
6868
return 0;

‎bld/browser/dlgprs/h/dialog.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333

3434
#ifndef __DIALOG_H__
35-
#define __DIALOG_H__
3635

3736
#ifdef __WATCOMC__
3837
// ignore "temporary object used to initialize non-constant reference" warning
@@ -83,5 +82,6 @@ class Dialog {
8382
};
8483

8584

85+
#define __DIALOG_H__
8686
#endif
8787

‎bld/cc/c/cmac1.c‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ static void EnlargeTokenBuf( size_t size )
116116
static size_t WriteTokenBufToken( size_t i, TOKEN t )
117117
/***************************************************/
118118
{
119-
EnlargeTokenBuf( i + SIZE_MTOKEN );
120-
SET_MTOKEN( TokenBuf + i, t );
121-
return( i + SIZE_MTOKEN );
119+
EnlargeTokenBuf( MTOKINCR( i ) );
120+
MTOK( TokenBuf + i ) = t;
121+
return( MTOKINCR( i ) );
122122
}
123123

124124
static size_t WriteTokenBufChar( size_t i, char c )
@@ -140,8 +140,8 @@ static size_t WriteTokenBufMem( size_t i, const char *buf, size_t len )
140140
static size_t TokenBufRemoveWSToken( size_t i )
141141
/*********************************************/
142142
{
143-
if( i >= SIZE_MTOKEN )
144-
return( i - SIZE_MTOKEN );
143+
if( i >= MTOKINCR( 0 ) )
144+
return( MTOKDECR( i ) );
145145
return( i );
146146
}
147147

@@ -224,8 +224,8 @@ static void DumpMacroDefn( const char *p )
224224
unsigned char c;
225225
TOKEN token;
226226

227-
while( (token = GET_MTOKEN( p )) != T_NULL ) {
228-
p += SIZE_MTOKEN;
227+
while( (token = MTOK( p )) != T_NULL ) {
228+
MTOKINC( p );
229229
switch( token ) {
230230
case T_CONSTANT:
231231
case T_PPNUMBER:
@@ -254,7 +254,7 @@ static void DumpMacroDefn( const char *p )
254254
break;
255255
case T_MACRO_PARM:
256256
case T_MACRO_VAR_PARM:
257-
p++;
257+
MTOKPARMINC( p );
258258
break;
259259
default:
260260
fprintf( CppFile, "%s", TokenString[token] );
@@ -279,7 +279,7 @@ void DumpAllMacros( void )
279279
continue;
280280
fprintf( CppFile, "#define %s", mentry->macro_name );
281281
p = (char *)mentry + mentry->macro_defn;
282-
if( GET_MTOKEN( p ) != T_NULL ) {
282+
if( MTOK( p ) != T_NULL ) {
283283
fputc( ' ', CppFile );
284284
DumpMacroDefn( p );
285285
}
@@ -305,8 +305,7 @@ static void DeleteNestedMacro( void )
305305
mentry = nested->mentry;
306306
CMemFree( nested );
307307
if( macro_parms != NULL ) {
308-
parmno = GetMacroParmCount( mentry );
309-
while( parmno-- > 0 ) {
308+
for( parmno = GetMacroParmCount( mentry ); parmno-- > 0; ) {
310309
CMemFree( macro_parms[parmno].arg );
311310
}
312311
CMemFree( macro_parms );
@@ -658,8 +657,8 @@ void DumpMDefn( const char *p )
658657
unsigned char c;
659658
TOKEN token;
660659

661-
while( (token = GET_MTOKEN( p )) != T_NULL ) {
662-
p += SIZE_MTOKEN;
660+
while( (token = MTOK( p )) != T_NULL ) {
661+
MTOKINC( p );
663662
switch( token ) {
664663
case T_CONSTANT:
665664
case T_PPNUMBER:
@@ -686,12 +685,12 @@ void DumpMDefn( const char *p )
686685
putchar( *p++ );
687686
break;
688687
case T_MACRO_PARM:
689-
printf( "<parm#%d>", *(unsigned char *)p );
690-
p++;
688+
printf( "<parm#%d>", MTOKPARM( p ) );
689+
MTOKPARMINC( p );
691690
break;
692691
case T_MACRO_VAR_PARM:
693-
printf( "<varparm#%d>", *(unsigned char *)p );
694-
p++;
692+
printf( "<varparm#%d>", MTOKPARM( p ) );
693+
MTOKPARMINC( p );
695694
break;
696695
default:
697696
printf( "%s", TokenString[token] );
@@ -1002,11 +1001,11 @@ static MACRO_TOKEN *BuildString( const char *p )
10021001
if( p != NULL ) {
10031002
pmtok_tail = &mtok_head;
10041003
TokenLen = 0;
1005-
while( GET_MTOKEN( p ) == T_WHITE_SPACE ) {
1006-
p += SIZE_MTOKEN; //eat leading white space
1004+
while( MTOK( p ) == T_WHITE_SPACE ) {
1005+
MTOKINC( p ); //eat leading white space
10071006
}
1008-
while( (token = GET_MTOKEN( p )) != T_NULL ) {
1009-
p += SIZE_MTOKEN;
1007+
while( (token = MTOK( p )) != T_NULL ) {
1008+
MTOKINC( p );
10101009
switch( token ) {
10111010
case T_CONSTANT:
10121011
case T_PPNUMBER:
@@ -1034,15 +1033,15 @@ static MACRO_TOKEN *BuildString( const char *p )
10341033
WriteBufferChar( '"' );
10351034
break;
10361035
case T_WHITE_SPACE:
1037-
while( (token = GET_MTOKEN( p )) == T_WHITE_SPACE ) {
1038-
p += SIZE_MTOKEN;
1036+
while( (token = MTOK( p )) == T_WHITE_SPACE ) {
1037+
MTOKINC( p );
10391038
}
10401039
if( token != T_NULL ) {
10411040
WriteBufferChar( ' ' );
10421041
}
10431042
break;
10441043
case T_BAD_CHAR:
1045-
if( *p == '\\' && GET_MTOKEN( p + 1 ) == T_NULL ) {
1044+
if( *p == '\\' && MTOK( p + 1 ) == T_NULL ) {
10461045
CErr1( ERR_INVALID_STRING_LITERAL );
10471046
}
10481047
WriteBufferChar( *p++ );
@@ -1081,8 +1080,8 @@ static MACRO_TOKEN *BuildMTokenList( const char *p, MACRO_ARG *macro_parms )
10811080
token_prev = T_NULL;
10821081
if( p == NULL )
10831082
return( NULL );
1084-
while( (token = GET_MTOKEN( p )) != T_NULL ) {
1085-
p += SIZE_MTOKEN;
1083+
while( (token = MTOK( p )) != T_NULL ) {
1084+
MTOKINC( p );
10861085
switch( token ) {
10871086
case T_CONSTANT:
10881087
case T_PPNUMBER:
@@ -1105,27 +1104,27 @@ static MACRO_TOKEN *BuildMTokenList( const char *p, MACRO_ARG *macro_parms )
11051104
mtok = BuildAToken( T_BAD_CHAR, buf );
11061105
break;
11071106
case T_MACRO_SHARP:
1108-
while( GET_MTOKEN( p ) == T_WHITE_SPACE ) {
1109-
p += SIZE_MTOKEN;
1107+
while( MTOK( p ) == T_WHITE_SPACE ) {
1108+
MTOKINC( p );
11101109
}
1111-
p += SIZE_MTOKEN; // skip over T_MACRO_PARM
1110+
MTOKINC( p ); // skip over T_MACRO_PARM
11121111
/*
11131112
* If no macro arg given, result must be "", not empty
11141113
*/
1115-
parmno = *(unsigned char *)p;
1116-
p++;
1114+
parmno = MTOKPARM( p );
1115+
MTOKPARMINC( p );
11171116
if( macro_parms != NULL && macro_parms[parmno].arg != NULL && macro_parms[parmno].arg[0] != '\0' ) {
11181117
mtok = BuildString( macro_parms[parmno].arg );
11191118
} else {
11201119
mtok = BuildAToken( T_STRING, "" );
11211120
}
11221121
break;
11231122
case T_MACRO_PARM:
1124-
parmno = *(unsigned char *)p;
1125-
p++;
1123+
parmno = MTOKPARM( p );
1124+
MTOKPARMINC( p );
11261125
p2 = p;
1127-
while( GET_MTOKEN( p2 ) == T_WHITE_SPACE ) {
1128-
p2 += SIZE_MTOKEN;
1126+
while( MTOK( p2 ) == T_WHITE_SPACE ) {
1127+
MTOKINC( p2 );
11291128
}
11301129
nested->substituting_parms = true;
11311130
if( macro_parms != NULL ) {
@@ -1136,7 +1135,7 @@ static MACRO_TOKEN *BuildMTokenList( const char *p, MACRO_ARG *macro_parms )
11361135
} else {
11371136
mtok = BuildAToken( T_WHITE_SPACE, "" );
11381137
}
1139-
if( GET_MTOKEN( p2 ) != T_MACRO_SHARP_SHARP && token_prev != T_MACRO_SHARP_SHARP ) {
1138+
if( MTOK( p2 ) != T_MACRO_SHARP_SHARP && token_prev != T_MACRO_SHARP_SHARP ) {
11401139
if( mtok != NULL ) {
11411140
mtok = AppendToken( mtok, T_NULL, "P-<end of parm>" );
11421141
mtok = ExpandNestedMacros( mtok, false );
@@ -1147,17 +1146,17 @@ static MACRO_TOKEN *BuildMTokenList( const char *p, MACRO_ARG *macro_parms )
11471146
nested->substituting_parms = false;
11481147
break;
11491148
case T_MACRO_VAR_PARM:
1150-
parmno = *(unsigned char *)p;
1151-
p++;
1149+
parmno = MTOKPARM( p );
1150+
MTOKPARMINC( p );
11521151
p2 = p;
1153-
while( GET_MTOKEN( p2 ) == T_WHITE_SPACE )
1154-
p2 += SIZE_MTOKEN;
1152+
while( MTOK( p2 ) == T_WHITE_SPACE )
1153+
MTOKINC( p2 );
11551154
nested->substituting_parms = true;
11561155
if( macro_parms != NULL ) {
11571156
if( macro_parms[parmno].arg != NULL ) {
11581157
mtok = BuildMTokenList( macro_parms[parmno].arg, NULL );
11591158
} else {
1160-
if( token_prev == T_MACRO_SHARP_SHARP || GET_MTOKEN( p2 ) == T_MACRO_SHARP_SHARP ) {
1159+
if( token_prev == T_MACRO_SHARP_SHARP || MTOK( p2 ) == T_MACRO_SHARP_SHARP ) {
11611160
mtok = BuildAToken( T_MACRO_EMPTY_VAR_PARM, "" );
11621161
} else {
11631162
mtok = BuildAToken( T_WHITE_SPACE, "" );
@@ -1166,7 +1165,7 @@ static MACRO_TOKEN *BuildMTokenList( const char *p, MACRO_ARG *macro_parms )
11661165
} else {
11671166
mtok = BuildAToken( T_WHITE_SPACE, "" );
11681167
}
1169-
if( GET_MTOKEN( p2 ) != T_MACRO_SHARP_SHARP && token_prev != T_MACRO_SHARP_SHARP ) {
1168+
if( MTOK( p2 ) != T_MACRO_SHARP_SHARP && token_prev != T_MACRO_SHARP_SHARP ) {
11701169
if( mtok != NULL ) {
11711170
mtok = AppendToken( mtok, T_NULL, "P-<end of parm>" );
11721171
mtok = ExpandNestedMacros( mtok, false );

‎bld/cc/c/cmac2.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ static MEPTR GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR fo
535535
if( CurToken != T_WHITE_SPACE ) {
536536
if( prev_non_ws_token == T_MACRO_SHARP && CurToken != T_MACRO_PARM && CurToken != T_MACRO_VAR_PARM ) {
537537
CErr1( ERR_MUST_BE_MACRO_PARM );
538-
// SET_MTOKEN( MacroOffset + mlen - SIZE_MTOKEN, T_SHARP );
538+
// MTOK( MacroOffset + MTOKDECR( mlen ) ) = T_SHARP;
539539
}
540540
prev_non_ws_token = CurToken;
541541
}
@@ -546,7 +546,7 @@ static MEPTR GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR fo
546546
CErr1( ERR_MUST_BE_MACRO_PARM );
547547
}
548548
if( prev_token == T_WHITE_SPACE ) {
549-
mlen -= SIZE_MTOKEN;
549+
MTOKDEC( mlen );
550550
}
551551
MacroSegmentAddToken( &mlen, T_NULL );
552552
if( prev_non_ws_token == T_MACRO_SHARP_SHARP ) {

‎bld/cc/c/cmacadd.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ void MacroSegmentAddToken( // MacroSegment: ADD A TOKEN
218218
size_t clen;
219219

220220
clen = *mlen;
221-
MacroReallocOverflow( clen + SIZE_MTOKEN, clen );
222-
SET_MTOKEN( MacroOffset + clen, token );
223-
*mlen = clen + SIZE_MTOKEN;
221+
MacroReallocOverflow( MTOKINCR( clen ), clen );
222+
MTOK( MacroOffset + clen ) = token;
223+
*mlen = MTOKINCR( clen );
224224
}
225225

226226

‎bld/cc/h/macro.h‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@
3030
****************************************************************************/
3131

3232

33-
#define TYPE_MTOKEN unsigned char
34-
#define SIZE_MTOKEN sizeof( TYPE_MTOKEN )
35-
#define GET_MTOKEN(x) (*(TYPE_MTOKEN *)(x))
36-
#define SET_MTOKEN(x,v) (*(TYPE_MTOKEN *)(x)=(v))
33+
#define MTOK(p) (*(unsigned char *)(p))
34+
#define MTOKINC(p) p++
35+
#define MTOKDEC(p) p--
36+
#define MTOKINCR(r) ((r) + 1)
37+
#define MTOKDECR(r) ((r) - 1)
38+
#define MTOKPARM(p) (*(mac_parm_count *)(p))
39+
#define MTOKPARMINC(p) p += sizeof( mac_parm_count )
3740

3841
#define GetMacroParmCount(m) ((m)->parm_count - 1)
3942
#define MacroWithParenthesis(m) ((m)->parm_count > 0)

‎bld/cg/c/cgmemmgr.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ essentially no worst case performance scenario.
8686
#define MIN_SIZE 4 /* 16 (2 ^ 4) */
8787
#define MAX_CLASS (MAX_SIZE - MIN_SIZE)
8888

89-
#if defined( _M_X64 ) || defined( _M_ARM64 )
89+
#if defined( LONG_IS_64BITS ) || defined( _WIN64 )
9090
#define MEM_WORD_SIZE 16 /* Needed to keep alignment. */
9191
#define MEMPTR_SIZE 8
9292
#define TAG_SIZE 8

‎bld/dwarf/dw/h/dwcliuti.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
#define DWCLIUTI_H_INCLUDED
3535

3636
#ifndef __BIG_ENDIAN__
37-
#define WriteU16( __p, __v ) MPUT_16_UN((__p), (__v))
38-
#define WriteU32( __p, __v ) MPUT_32_UN((__p), (__v))
39-
#define WriteS16( __p, __v ) MPUT_16_UN((__p), (__v))
40-
#define WriteS32( __p, __v ) MPUT_32_UN((__p), (__v))
37+
#define WriteU16( __p, __v ) MPUT_U16_UN((__p), (__v))
38+
#define WriteU32( __p, __v ) MPUT_U32_UN((__p), (__v))
39+
#define WriteS16( __p, __v ) MPUT_U16_UN((__p), (__v))
40+
#define WriteS32( __p, __v ) MPUT_U32_UN((__p), (__v))
4141
#else
4242
#error "must define WriteU16/32 and WriteS16/32 functions"
4343
#endif

‎bld/fe_misc/h/carve.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ extern void CarveFree( carve_t cv, void *elm );
8484

8585
#ifdef CARVEPCH
8686

87-
#if defined( _M_X64 ) || defined( _M_ARM64 )
87+
#if defined( LONG_IS_64BIT ) || defined( _WIN64 )
8888
#define CV_SHIFT 18
8989
#else
9090
#define CV_SHIFT 17

‎bld/omftools/c/misc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ unsigned_16 GetUInt( void )
286286
{
287287
unsigned_16 word;
288288

289-
word = MGET_LE_U16_UN( ReadRecPtr );
289+
word = MGET_LE_U16( ReadRecPtr );
290290
ReadRecPtr += sizeof( unsigned_16 );
291291
return( word );
292292
}

0 commit comments

Comments
 (0)