[FAST486]

- Remove an unneeded inclusion to the CRT header: limits.h (and use instead NDK definitions for max/min long values).
- Remove unneeded comments...
[NTVDM]
Remove an unneeded add_dependencies(...) command.

svn path=/branches/ntvdm/; revision=60767
This commit is contained in:
Hermès Bélusca-Maïto 2013-10-27 11:42:44 +00:00
parent 62da9a9deb
commit 2c8e8ba5d3
11 changed files with 16 additions and 25 deletions

View file

@ -22,8 +22,14 @@
#ifndef _FAST486_H_ #ifndef _FAST486_H_
#define _FAST486_H_ #define _FAST486_H_
#pragma once
/* DEFINES ********************************************************************/ /* DEFINES ********************************************************************/
#ifndef FASTCALL
#define FASTCALL __fastcall
#endif
#define FAST486_NUM_GEN_REGS 8 #define FAST486_NUM_GEN_REGS 8
#define FAST486_NUM_SEG_REGS 6 #define FAST486_NUM_SEG_REGS 6
#define FAST486_NUM_CTRL_REGS 3 #define FAST486_NUM_CTRL_REGS 3

View file

@ -21,8 +21,6 @@
/* INCLUDES *******************************************************************/ /* INCLUDES *******************************************************************/
// #define WIN32_NO_STATUS
// #define _INC_WINDOWS
#include <windef.h> #include <windef.h>
// #define NDEBUG // #define NDEBUG

View file

@ -22,11 +22,9 @@
#ifndef _COMMON_H_ #ifndef _COMMON_H_
#define _COMMON_H_ #define _COMMON_H_
/* DEFINES ********************************************************************/ #pragma once
#ifndef FASTCALL /* DEFINES ********************************************************************/
#define FASTCALL __fastcall
#endif
#define SIGN_FLAG_BYTE 0x80 #define SIGN_FLAG_BYTE 0x80
#define SIGN_FLAG_WORD 0x8000 #define SIGN_FLAG_WORD 0x8000

View file

@ -21,8 +21,6 @@
/* INCLUDES *******************************************************************/ /* INCLUDES *******************************************************************/
// #define WIN32_NO_STATUS
// #define _INC_WINDOWS
#include <windef.h> #include <windef.h>
// #define NDEBUG // #define NDEBUG

View file

@ -22,7 +22,10 @@
#ifndef _EXTRAOPS_H_ #ifndef _EXTRAOPS_H_
#define _EXTRAOPS_H_ #define _EXTRAOPS_H_
#pragma once
/* DEFINES ********************************************************************/ /* DEFINES ********************************************************************/
FAST486_OPCODE_HANDLER(Fast486ExtOpcodeClts); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeClts);
FAST486_OPCODE_HANDLER(Fast486ExtOpcodeStoreControlReg); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeStoreControlReg);
FAST486_OPCODE_HANDLER(Fast486ExtOpcodeStoreDebugReg); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeStoreDebugReg);

View file

@ -21,8 +21,6 @@
/* INCLUDES *******************************************************************/ /* INCLUDES *******************************************************************/
// #define WIN32_NO_STATUS
// #define _INC_WINDOWS
#include <windef.h> #include <windef.h>
// #define NDEBUG // #define NDEBUG

View file

@ -21,10 +21,7 @@
/* INCLUDES *******************************************************************/ /* INCLUDES *******************************************************************/
// #define WIN32_NO_STATUS
// #define _INC_WINDOWS
#include <windef.h> #include <windef.h>
#include <limits.h>
// #define NDEBUG // #define NDEBUG
#include <debug.h> #include <debug.h>
@ -3694,11 +3691,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeImulModrmImm)
} }
/* Check for carry/overflow */ /* Check for carry/overflow */
if ((Product < LONG_MIN) || (Product > LONG_MAX)) State->Flags.Cf = State->Flags.Of = ((Product < MINLONG) || (Product > MAXLONG));
{
State->Flags.Cf = State->Flags.Of = TRUE;
}
else State->Flags.Cf = State->Flags.Of = FALSE;
/* Write-back the result */ /* Write-back the result */
return Fast486WriteModrmDwordOperands(State, return Fast486WriteModrmDwordOperands(State,

View file

@ -22,11 +22,9 @@
#ifndef _OPCODES_H_ #ifndef _OPCODES_H_
#define _OPCODES_H_ #define _OPCODES_H_
/* DEFINES ********************************************************************/ #pragma once
#ifndef FASTCALL /* DEFINES ********************************************************************/
#define FASTCALL __fastcall
#endif
#define FAST486_NUM_OPCODE_HANDLERS 256 #define FAST486_NUM_OPCODE_HANDLERS 256
#define FAST486_OPCODE_WRITE_REG (1 << 1) #define FAST486_OPCODE_WRITE_REG (1 << 1)

View file

@ -21,8 +21,6 @@
/* INCLUDES *******************************************************************/ /* INCLUDES *******************************************************************/
// #define WIN32_NO_STATUS
// #define _INC_WINDOWS
#include <windef.h> #include <windef.h>
// #define NDEBUG // #define NDEBUG

View file

@ -22,6 +22,8 @@
#ifndef _OPGROUPS_H_ #ifndef _OPGROUPS_H_
#define _OPGROUPS_H_ #define _OPGROUPS_H_
#pragma once
/* DEFINES ********************************************************************/ /* DEFINES ********************************************************************/
FAST486_OPCODE_HANDLER(Fast486OpcodeGroup8082); FAST486_OPCODE_HANDLER(Fast486OpcodeGroup8082);

View file

@ -20,5 +20,4 @@ add_executable(ntvdm ${SOURCE})
set_module_type(ntvdm win32cui UNICODE) set_module_type(ntvdm win32cui UNICODE)
target_link_libraries(ntvdm fast486) target_link_libraries(ntvdm fast486)
add_importlibs(ntvdm msvcrt user32 gdi32 kernel32 ntdll) add_importlibs(ntvdm msvcrt user32 gdi32 kernel32 ntdll)
add_dependencies(ntvdm fast486)
add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all) add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all)