Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Felix Münchhalfen
wine
Commits
dfa41308
Commit
dfa41308
authored
24 years ago
by
Ove Kåven
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Merged DOSVM_Int with DOSVM_SimulateInt, and made it handle apps that
purposefully shuffle the interrupt vectors around.
parent
036ae0b6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
loader/dos/dosvm.c
+24
-21
24 additions, 21 deletions
loader/dos/dosvm.c
with
24 additions
and
21 deletions
loader/dos/dosvm.c
+
24
−
21
View file @
dfa41308
...
...
@@ -126,27 +126,29 @@ static void DOSVM_Dump( int fn, int sig, struct vm86plus_struct*VM86 )
printf
(
"
\n
"
);
}
static
int
DOSVM_Int
(
int
vect
,
CONTEXT86
*
context
)
{
if
(
vect
==
0x31
)
{
if
(
context
->
SegCs
==
DOSMEM_wrap_seg
)
{
/* exit from real-mode wrapper */
return
-
1
;
}
/* we could probably move some other dodgy stuff here too from dpmi.c */
}
INT_RealModeInterrupt
(
vect
,
context
);
return
0
;
}
static
void
DOSVM_SimulateInt
(
int
vect
,
CONTEXT86
*
context
)
static
int
DOSVM_SimulateInt
(
int
vect
,
CONTEXT86
*
context
)
{
FARPROC16
handler
=
INT_GetRMHandler
(
vect
);
if
(
SELECTOROF
(
handler
)
==
0xf000
)
{
/* if internal interrupt, call it directly */
INT_RealModeInterrupt
(
vect
,
context
);
}
else
{
/* check for our real-mode hooks */
if
(
vect
==
0x31
)
{
if
(
context
->
SegCs
==
DOSMEM_wrap_seg
)
{
/* exit from real-mode wrapper */
return
-
1
;
}
/* we could probably move some other dodgy stuff here too from dpmi.c */
}
/* check if the call is from our fake BIOS interrupt stubs */
if
(
context
->
SegCs
==
0xf000
)
{
INT_RealModeInterrupt
(
vect
,
context
);
}
/* check if the call goes to an unhooked interrupt */
else
if
(
SELECTOROF
(
handler
)
==
0xf000
)
{
/* if so, call it directly */
INT_RealModeInterrupt
(
OFFSETOF
(
handler
)
/
4
,
context
);
}
/* the interrupt is hooked, simulate interrupt in DOS space */
else
{
WORD
*
stack
=
PTR_REAL_TO_LIN
(
context
->
SegSs
,
context
->
Esp
);
WORD
flag
=
LOWORD
(
context
->
EFlags
);
...
...
@@ -161,6 +163,7 @@ static void DOSVM_SimulateInt( int vect, CONTEXT86 *context )
context
->
Eip
=
OFFSETOF
(
handler
);
IF_CLR
(
context
);
}
return
0
;
}
#define SHOULD_PEND(x) \
...
...
@@ -316,7 +319,7 @@ static int DOSVM_Process( int fn, int sig, struct vm86plus_struct*VM86 )
case
VM86_INTx
:
if
(
TRACE_ON
(
relay
))
DPRINTF
(
"Call DOS int 0x%02x (EAX=%08lx) ret=%04lx:%04lx
\n
"
,
VM86_ARG
(
fn
),
context
.
Eax
,
context
.
SegCs
,
context
.
Eip
);
ret
=
DOSVM_Int
(
VM86_ARG
(
fn
),
&
context
);
ret
=
DOSVM_
Simulate
Int
(
VM86_ARG
(
fn
),
&
context
);
if
(
TRACE_ON
(
relay
))
DPRINTF
(
"Ret DOS int 0x%02x (EAX=%08lx) ret=%04lx:%04lx
\n
"
,
VM86_ARG
(
fn
),
context
.
Eax
,
context
.
SegCs
,
context
.
Eip
);
break
;
...
...
@@ -561,7 +564,7 @@ void DOSVM_SetTimer( unsigned ticks )
if
(
MZ_Current
())
{
/* the PC clocks ticks at 1193180 Hz */
tim
.
tv_sec
=
0
;
tim
.
tv_usec
=
((
unsigned
long
long
)
ticks
*
1000000
)
/
1193180
;
tim
.
tv_usec
=
MulDiv
(
ticks
,
1000000
,
1193180
)
;
/* sanity check */
if
(
!
tim
.
tv_usec
)
tim
.
tv_usec
=
1
;
...
...
@@ -594,7 +597,7 @@ unsigned DOSVM_GetTimer( void )
ERR_
(
module
)(
"dosmod sync lost, errno=%d
\n
"
,
errno
);
return
0
;
}
return
((
unsigned
long
long
)
tim
.
tv_usec
*
1193180
)
/
1000000
;
return
MulDiv
(
tim
.
tv_usec
,
1193180
,
1000000
)
;
}
return
0
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment