Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
cmucl-copy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Richard M Kreuter
cmucl-copy
Commits
b3a49942
Commit
b3a49942
authored
8 years ago
by
Robert Swindells
Browse files
Options
Downloads
Patches
Plain Diff
Update to NetBSD-7 mcontext API.
parent
19b642fb
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/lisp/NetBSD-os.c
+18
-16
18 additions, 16 deletions
src/lisp/NetBSD-os.c
with
18 additions
and
16 deletions
src/lisp/NetBSD-os.c
+
18
−
16
View file @
b3a49942
...
@@ -27,6 +27,8 @@
...
@@ -27,6 +27,8 @@
#include
<sys/sysctl.h>
#include
<sys/sysctl.h>
#include
<errno.h>
#include
<errno.h>
#include
<x86/fpu.h>
#include
"os.h"
#include
"os.h"
#include
"arch.h"
#include
"arch.h"
#include
"globals.h"
#include
"globals.h"
...
@@ -133,19 +135,19 @@ os_sigcontext_fpu_modes(ucontext_t *scp)
...
@@ -133,19 +135,19 @@ os_sigcontext_fpu_modes(ucontext_t *scp)
{
{
unsigned
int
modes
;
unsigned
int
modes
;
union
savefpu
*
sv
=
(
union
savefpu
*
)
&
scp
->
uc_mcontext
.
__fpregs
.
__fp_reg_set
;
union
savefpu
*
sv
=
&
scp
->
uc_mcontext
.
__fpregs
.
__fp_reg_set
;
struct
env
87
*
env_87
=
(
struct
env
87
*
)
&
sv
->
sv_87
.
sv_env
;
struct
save
87
*
env_87
=
(
struct
save
87
*
)
&
sv
->
sv_87
;
struct
envxmm
*
env_xmm
=
(
struct
envxmm
*
)
&
sv
->
sv_xmm
.
sv_env
;
struct
fxsave
*
env_xmm
=
(
struct
fxsave
*
)
&
sv
->
sv_xmm
;
u_int16_t
cw
;
u_int16_t
cw
;
u_int16_t
sw
;
u_int16_t
sw
;
if
(
scp
->
uc_flags
&
_UC_FPU
)
{
if
(
scp
->
uc_flags
&
_UC_FPU
)
{
if
(
scp
->
uc_flags
&
_UC_FXSAVE
)
{
if
(
scp
->
uc_flags
&
_UC_FXSAVE
)
{
cw
=
env_xmm
->
en
_cw
;
cw
=
env_xmm
->
fx
_cw
;
sw
=
env_xmm
->
en
_sw
;
sw
=
env_xmm
->
fx
_sw
;
}
else
{
}
else
{
cw
=
env_87
->
en
_cw
&
0xffff
;
cw
=
env_87
->
s87
_cw
&
0xffff
;
sw
=
env_87
->
en
_sw
&
0xffff
;
sw
=
env_87
->
s87
_sw
&
0xffff
;
}
}
}
else
{
}
else
{
cw
=
0
;
cw
=
0
;
...
@@ -156,7 +158,7 @@ os_sigcontext_fpu_modes(ucontext_t *scp)
...
@@ -156,7 +158,7 @@ os_sigcontext_fpu_modes(ucontext_t *scp)
#ifdef FEATURE_SSE2
#ifdef FEATURE_SSE2
if
(
fpu_mode
==
SSE2
)
{
if
(
fpu_mode
==
SSE2
)
{
u_int32_t
mxcsr
=
env_xmm
->
en
_mxcsr
;
u_int32_t
mxcsr
=
env_xmm
->
fx
_mxcsr
;
DPRINTF
(
0
,
(
stderr
,
"SSE2 modes = %08x
\n
"
,
(
int
)
mxcsr
));
DPRINTF
(
0
,
(
stderr
,
"SSE2 modes = %08x
\n
"
,
(
int
)
mxcsr
));
modes
|=
mxcsr
;
modes
|=
mxcsr
;
...
@@ -347,9 +349,9 @@ sigfpe_handler(HANDLER_ARGS)
...
@@ -347,9 +349,9 @@ sigfpe_handler(HANDLER_ARGS)
}
}
if
(
ucontext
->
uc_flags
&
_UC_FXSAVE
)
{
if
(
ucontext
->
uc_flags
&
_UC_FXSAVE
)
{
sv
->
sv_xmm
.
sv_env
.
en
_sw
|=
trap
;
sv
->
sv_xmm
.
fx
_sw
|=
trap
;
}
else
{
}
else
{
sv
->
sv_87
.
s
v_env
.
en
_sw
|=
trap
;
sv
->
sv_87
.
s
87
_sw
|=
trap
;
}
}
interrupt_handle_now
(
signal
,
code
,
context
);
interrupt_handle_now
(
signal
,
code
,
context
);
}
}
...
@@ -385,16 +387,16 @@ os_dlsym(const char *sym_name, lispobj lib_list)
...
@@ -385,16 +387,16 @@ os_dlsym(const char *sym_name, lispobj lib_list)
void
void
restore_fpu
(
ucontext_t
*
scp
)
restore_fpu
(
ucontext_t
*
scp
)
{
{
union
savefpu
*
sv
=
(
union
savefpu
*
)
&
scp
->
uc_mcontext
.
__fpregs
.
__fp_reg_set
;
union
savefpu
*
sv
=
&
scp
->
uc_mcontext
.
__fpregs
.
__fp_reg_set
;
struct
env
87
*
env_87
=
&
sv
->
sv_87
.
sv_env
;
struct
save
87
*
env_87
=
(
struct
save87
*
)
&
sv
->
sv_87
;
struct
envxmm
*
env_xmm
=
&
sv
->
sv_xmm
.
sv_env
;
struct
fxsave
*
env_xmm
=
(
struct
fxsave
*
)
&
sv
->
sv_xmm
;
u_int16_t
cw
;
u_int16_t
cw
;
if
(
scp
->
uc_flags
&
_UC_FPU
)
{
if
(
scp
->
uc_flags
&
_UC_FPU
)
{
if
(
scp
->
uc_flags
&
_UC_FXSAVE
)
{
if
(
scp
->
uc_flags
&
_UC_FXSAVE
)
{
cw
=
env_xmm
->
en
_cw
;
cw
=
env_xmm
->
fx
_cw
;
}
else
{
}
else
{
cw
=
env_87
->
en
_cw
&
0xffff
;
cw
=
env_87
->
s87
_cw
&
0xffff
;
}
}
}
else
{
}
else
{
return
;
return
;
...
@@ -403,7 +405,7 @@ restore_fpu(ucontext_t *scp)
...
@@ -403,7 +405,7 @@ restore_fpu(ucontext_t *scp)
__asm__
__volatile__
(
"fldcw %0"
::
"m"
(
*&
cw
));
__asm__
__volatile__
(
"fldcw %0"
::
"m"
(
*&
cw
));
if
(
fpu_mode
==
SSE2
)
{
if
(
fpu_mode
==
SSE2
)
{
u_int32_t
mxcsr
=
env_xmm
->
en
_mxcsr
;
u_int32_t
mxcsr
=
env_xmm
->
fx
_mxcsr
;
DPRINTF
(
0
,
(
stderr
,
"restore_fpu: mxcsr (raw) = %04x
\n
"
,
mxcsr
));
DPRINTF
(
0
,
(
stderr
,
"restore_fpu: mxcsr (raw) = %04x
\n
"
,
mxcsr
));
__asm__
__volatile__
(
"ldmxcsr %0"
::
"m"
(
*&
mxcsr
));
__asm__
__volatile__
(
"ldmxcsr %0"
::
"m"
(
*&
mxcsr
));
...
...
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