claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into nec-v20

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-07-24 17:20:53 -04:00
parent b14f794f56 681127e521
commit b3bca26471
78 changed files with 4872 additions and 2960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpu/386_common.c
View File

@@ -1870,9 +1870,6 @@ cpu_fast_off_period_set(uint16_t val, double period)
void
cpu_fast_off_reset(void)
{
if (cpu_fast_off_timer)
timer_disable(cpu_fast_off_timer);
cpu_register_fast_off_handler(NULL);
cpu_fast_off_period = 0.0;
cpu_fast_off_advance();

30
src/cpu/cpu.c
View File

@@ -51,21 +51,21 @@
enum {
CPUID_FPU = (1 << 0),
CPUID_VME = (1 << 1),
CPUID_PSE = (1 << 3),
CPUID_TSC = (1 << 4),
CPUID_MSR = (1 << 5),
CPUID_PAE = (1 << 6),
CPUID_MCE = (1 << 7),
CPUID_CMPXCHG8B = (1 << 8),
CPUID_AMDSEP = (1 << 10),
CPUID_SEP = (1 << 11),
CPUID_MTRR = (1 << 12),
CPUID_MCA = (1 << 14),
CPUID_CMOV = (1 << 15),
CPUID_MMX = (1 << 23),
CPUID_FXSR = (1 << 24)
CPUID_FPU = (1 << 0),
CPUID_VME = (1 << 1),
CPUID_PSE = (1 << 3),
CPUID_TSC = (1 << 4),
CPUID_MSR = (1 << 5),
CPUID_PAE = (1 << 6),
CPUID_MCE = (1 << 7),
CPUID_CMPXCHG8B = (1 << 8),
CPUID_AMDSEP = (1 << 10),
CPUID_SEP = (1 << 11),
CPUID_MTRR = (1 << 12),
CPUID_MCA = (1 << 14),
CPUID_CMOV = (1 << 15),
CPUID_MMX = (1 << 23),
CPUID_FXSR = (1 << 24)
};
/*Addition flags returned by CPUID function 0x80000001*/

4
src/cpu/x86_ops_misc.h
View File

@@ -259,7 +259,7 @@ static int opF6_a32(uint32_t fetchdat)
static int opF7_w_a16(uint32_t fetchdat)
{
uint32_t templ, templ2;
uint32_t templ, templ2 = 0;
int tempws, tempws2 = 0;
int16_t temps16;
uint16_t src, dst;
@@ -356,7 +356,7 @@ static int opF7_w_a16(uint32_t fetchdat)
}
static int opF7_w_a32(uint32_t fetchdat)
{
uint32_t templ, templ2;
uint32_t templ, templ2 = 0;
int tempws, tempws2 = 1;
int16_t temps16;
uint16_t src, dst;