Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update bld/dig/h/mados.h and all dependents #85

Merged
merged 6 commits into from
Sep 6, 2014
Merged

Update bld/dig/h/mados.h and all dependents #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ac8f4f
Update bld/dig/h/mados.h and all dependents
beketata Sep 5, 2014
07160cf
Update x86trace.c
beketata Sep 5, 2014
c043e05
Update x86call.c
beketata Sep 5, 2014
f814069
Update accmisc.c
beketata Sep 5, 2014
ee73c8a
Update accmisc.c
beketata Sep 5, 2014
ecaf740
Update remfile.c
beketata Sep 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions bld/dig/h/mados.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@


// enum desc
pick_mad( OS_IDUNNO, "Unknown" )
pick_mad( OS_DOS, "DOS" )
pick_mad( OS_OS2, "OS/2" )
pick_mad( OS_PHARLAP, "Phar Lap 386 DOS Extender " )
pick_mad( OS_ECLIPSE, "Eclipse 386 DOS Extender" )
pick_mad( OS_NW386, "NetWare 386" )
pick_mad( OS_QNX, "QNX 4.x" )
pick_mad( OS_RATIONAL, "DOS/4G or compatible" )
pick_mad( OS_WINDOWS, "Windows 3.x" )
pick_mad( OS_PENPOINT, "PenPoint" )
pick_mad( OS_NT, "Win32" )
pick_mad( OS_NT64, "Win64" )
pick_mad( OS_AUTOCAD, "Autocad" )
pick_mad( OS_NEUTRINO, "QNX 6.x Neutrino" )
pick_mad( OS_LINUX, "Linux" )
pick_mad( OS_FREEBSD, "Free BSD" )
pick_mad( MAD_OS_IDUNNO, "Unknown" )
pick_mad( MAD_OS_DOS, "DOS" )
pick_mad( MAD_OS_OS2, "OS/2" )
pick_mad( MAD_OS_PHARLAP, "Phar Lap 386 DOS Extender " )
pick_mad( MAD_OS_ECLIPSE, "Eclipse 386 DOS Extender" )
pick_mad( MAD_OS_NW386, "NetWare 386" )
pick_mad( MAD_OS_QNX, "QNX 4.x" )
pick_mad( MAD_OS_RATIONAL, "DOS/4G or compatible" )
pick_mad( MAD_OS_WINDOWS, "Windows 3.x" )
pick_mad( MAD_OS_PENPOINT, "PenPoint" )
pick_mad( MAD_OS_NT, "Win32" )
pick_mad( MAD_OS_NT64, "Win64" )
pick_mad( MAD_OS_AUTOCAD, "Autocad" )
pick_mad( MAD_OS_NEUTRINO, "QNX 6.x Neutrino" )
pick_mad( MAD_OS_LINUX, "Linux" )
pick_mad( MAD_OS_FREEBSD, "Free BSD" )
2 changes: 1 addition & 1 deletion bld/mad/x86/c/x86call.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ mad_status DIGENTRY MICallUpStackLevel( mad_call_up_data *cud,
*out = NULL;
Is32BitSegment = BIG_SEG( *execution );
start = *startp;
if( MCSystemConfig()->os == OS_WINDOWS && !Is32BitSegment ) {
if( MCSystemConfig()->os == MAD_OS_WINDOWS && !Is32BitSegment ) {
memset( &start, 0, sizeof( start ) );
}
prev_sp_value = *stack;
Expand Down
20 changes: 10 additions & 10 deletions bld/mad/x86/c/x86trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,19 +251,19 @@ static walk_result TouchesScreenBuff( address a, mad_type_handle th, mad_memref_
if( mk & MMK_IMPLICIT )
return( WR_CONTINUE );
switch( MCSystemConfig()->os ) {
case OS_DOS:
case MAD_OS_DOS:
if( a.mach.segment < 0xa000 || a.mach.segment >= 0xc000 )
return( WR_CONTINUE );
break;
case OS_RATIONAL:
case MAD_OS_RATIONAL:
if( a.mach.segment != mr->x86.cpu.cs && a.mach.segment != mr->x86.cpu.ds )
return( WR_CONTINUE );
if( a.mach.offset < 0xa0000UL || a.mach.offset >= 0xc0000UL )
return( WR_CONTINUE );
break;
case OS_AUTOCAD:
case OS_PHARLAP:
case OS_ECLIPSE:
case MAD_OS_AUTOCAD:
case MAD_OS_PHARLAP:
case MAD_OS_ECLIPSE:
if( a.mach.segment == mr->x86.cpu.cs
|| a.mach.segment == mr->x86.cpu.ds )
return( WR_CONTINUE );
Expand All @@ -280,11 +280,11 @@ mad_trace_how DIGENTRY MITraceOne( mad_trace_data *td, mad_disasm_data *dd, ma
th = DoTraceOne( td, dd, tk, mr );
th = CheckSpecial( td, dd, mr, th );
switch( MCSystemConfig()->os ) {
case OS_OS2:
case OS_NW386:
case OS_QNX:
case OS_WINDOWS:
case OS_NT:
case MAD_OS_OS2:
case MAD_OS_NW386:
case MAD_OS_QNX:
case MAD_OS_WINDOWS:
case MAD_OS_NT:
break;
default:
DoDisasmMemRefWalk( dd, TouchesScreenBuff, mr, (void *)mr );
Expand Down
6 changes: 3 additions & 3 deletions bld/trap/lcl/nt/c/accmisc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ trap_retval ReqGet_sys_config( void )
SYSTEM_INFO info;

ret = GetOutPtr( 0 );
ret->sys.os = OS_NT;
ret->sys.os = MAD_OS_NT;
#if defined( __WATCOMC__ )
ret->sys.osmajor = _osmajor;
ret->sys.osminor = _osminor;
Expand All @@ -193,7 +193,7 @@ trap_retval ReqGet_sys_config( void )
ret->sys.cpu = X86CPUType();
ret->sys.fpu = ret->sys.cpu & X86_CPU_MASK;
if( IsWOW ) {
ret->sys.os = OS_WINDOWS;
ret->sys.os = MAD_OS_WINDOWS;
}
ret->sys.mad = MAD_X86;
#elif defined( MD_x64 )
Expand All @@ -202,7 +202,7 @@ trap_retval ReqGet_sys_config( void )
// ret->sys.cpu = X64_CPU1;
// ret->sys.fpu = X64_FPU1;
if( !IsWOW ) {
// ret->sys.os = OS_NT64;
// ret->sys.os = MAD_OS_NT64;
}
// ret->sys.mad = MAD_X64;
ret->sys.mad = MAD_X86;
Expand Down
2 changes: 1 addition & 1 deletion bld/trap/lcl/win/c/accmisc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ trap_retval ReqGet_sys_config( void )

ret = GetOutPtr( 0 );

ret->sys.os = OS_WINDOWS;
ret->sys.os = MAD_OS_WINDOWS;
ret->sys.osmajor = _osmajor;
ret->sys.osminor = _osminor;

Expand Down
10 changes: 5 additions & 5 deletions bld/wv/c/remfile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@ unsigned RemoteStringToFullName( bool executable, const char *name, char *res,
#ifdef __NT__
// check whether short filename is necessary
switch( SysConfig.os ) {
case OS_AUTOCAD:
case OS_DOS:
case OS_RATIONAL:
case OS_PHARLAP:
case OS_WINDOWS:
case MAD_OS_AUTOCAD:
case MAD_OS_DOS:
case MAD_OS_RATIONAL:
case MAD_OS_PHARLAP:
case MAD_OS_WINDOWS:
// convert long file name to short "DOS" compatible form
{
GetShortPathNameA( name, short_filename, MAX_PATH );
Expand Down