• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).


Commit MetaInfo

Revision85f50e1199f199526c16d7ba8362ed2820dce57f (tree)
Time2019-01-12 22:41:49
AuthorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[VM][I386] Fix FTBFS.

Change Summary

Incremental Difference

--- a/source/src/vm/libcpu_newdev/libcpu_i386/i386_opdef.cpp
+++ b/source/src/vm/libcpu_newdev/libcpu_i386/i386_opdef.cpp
@@ -132,7 +132,7 @@ void I386_OPS_BASE::i386_load_segment_descriptor( int segment )
132132 {
133133 i386_load_protected_mode_segment(&cpustate->sreg[segment], NULL );
134134 {
135- i386_set_descriptor_accessed(cpustate, cpustate->sreg[segment].selector);
135+ i386_set_descriptor_accessed(cpustate->sreg[segment].selector);
136136 cpustate->sreg[segment].flags |= 0x0001;
137137 }
138138 }
--- a/source/src/vm/libcpu_newdev/libcpu_i386/i486ops.cpp
+++ b/source/src/vm/libcpu_newdev/libcpu_i386/i486ops.cpp
@@ -156,7 +156,7 @@ void I386_OPS_BASE::I486OP(xadd_rm8_r8)() // Opcode 0x0f c0
156156 if( modrm >= 0xc0 ) {
157157 UINT8 dst = LOAD_RM8(modrm);
158158 UINT8 src = LOAD_REG8(modrm);
159- UINT8 sum = ADD8(cpustate, dst, src);
159+ UINT8 sum = ADD8(dst, src);
160160 STORE_REG8(modrm, dst);
161161 STORE_RM8(modrm, sum);
162162 CYCLES(CYCLES_XADD_REG_REG);
@@ -164,7 +164,7 @@ void I386_OPS_BASE::I486OP(xadd_rm8_r8)() // Opcode 0x0f c0
164164 UINT32 ea = GetEA(modrm, 1, 1);
165165 UINT8 dst = READ8(ea);
166166 UINT8 src = LOAD_REG8(modrm);
167- UINT8 sum = ADD8(cpustate, dst, src);
167+ UINT8 sum = ADD8(dst, src);
168168 WRITE8(ea, sum);
169169 STORE_REG8(modrm, dst);
170170 CYCLES(CYCLES_XADD_REG_MEM);
@@ -177,7 +177,7 @@ void I386_OPS_BASE::I486OP(xadd_rm16_r16)() // Opcode 0x0f c1
177177 if( modrm >= 0xc0 ) {
178178 UINT16 dst = LOAD_RM16(modrm);
179179 UINT16 src = LOAD_REG16(modrm);
180- UINT16 sum = ADD16(cpustate, dst, src);
180+ UINT16 sum = ADD16(dst, src);
181181 STORE_REG16(modrm, dst);
182182 STORE_RM16(modrm, sum);
183183 CYCLES(CYCLES_XADD_REG_REG);
@@ -185,7 +185,7 @@ void I386_OPS_BASE::I486OP(xadd_rm16_r16)() // Opcode 0x0f c1
185185 UINT32 ea = GetEA(modrm, 1, 2);
186186 UINT16 dst = READ16(ea);
187187 UINT16 src = LOAD_REG16(modrm);
188- UINT16 sum = ADD16(cpustate, dst, src);
188+ UINT16 sum = ADD16(dst, src);
189189 WRITE16(ea, sum);
190190 STORE_REG16(modrm, dst);
191191 CYCLES(CYCLES_XADD_REG_MEM);
@@ -198,7 +198,7 @@ void I386_OPS_BASE::I486OP(xadd_rm32_r32)() // Opcode 0x0f c1
198198 if( modrm >= 0xc0 ) {
199199 UINT32 dst = LOAD_RM32(modrm);
200200 UINT32 src = LOAD_REG32(modrm);
201- UINT32 sum = ADD32(cpustate, dst, src);
201+ UINT32 sum = ADD32(dst, src);
202202 STORE_REG32(modrm, dst);
203203 STORE_RM32(modrm, sum);
204204 CYCLES(CYCLES_XADD_REG_REG);
@@ -206,7 +206,7 @@ void I386_OPS_BASE::I486OP(xadd_rm32_r32)() // Opcode 0x0f c1
206206 UINT32 ea = GetEA(modrm, 1, 4);
207207 UINT32 dst = READ32(ea);
208208 UINT32 src = LOAD_REG32(modrm);
209- UINT32 sum = ADD32(cpustate, dst, src);
209+ UINT32 sum = ADD32(dst, src);
210210 WRITE32(ea, sum);
211211 STORE_REG32(modrm, dst);
212212 CYCLES(CYCLES_XADD_REG_MEM);
Show on old repository browser