aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/ia64/libuwx/src/uwx_ttrace.c
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2003-10-09 03:02:46 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>2003-10-09 03:02:46 +0000
commitc7f58afc391a25c51ec22c4ad8451aea2efc0126 (patch)
tree9dec43e80d7f3674fd0c49b4aacf17f5895efb65 /sys/contrib/ia64/libuwx/src/uwx_ttrace.c
parentdca737bc61f7ec7e6ee202e16bda1cdfaaf26332 (diff)
downloadsrc-c7f58afc391a25c51ec22c4ad8451aea2efc0126.tar.gz
src-c7f58afc391a25c51ec22c4ad8451aea2efc0126.zip
Upgrade Unwind Express (libuwx) to BETA 5. This upgrade includes
all the fixes locally applied and submitted to the author. Not included in BETA 5, but part of this import are: o FreeBSD specific ifdefs to make this compile within a kernel. These are limited to include directives and defines. o Removal of unused variables, proper casts and initializations to allow building with -Werror. This happens in code so has a higher chance of causing future import conflicts but not enough to worry about it. I'm especially thankful that the author accepted the change to replace DISABLE_TRACE with UWX_TRACE_ENABLE so that we can use it in kernel config files without nasty mappings or indirections as that would make the integration less perfect. Thanks Cary!
Notes
Notes: svn path=/vendor-sys/libuwx/dist/; revision=120925
Diffstat (limited to 'sys/contrib/ia64/libuwx/src/uwx_ttrace.c')
-rw-r--r--sys/contrib/ia64/libuwx/src/uwx_ttrace.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/sys/contrib/ia64/libuwx/src/uwx_ttrace.c b/sys/contrib/ia64/libuwx/src/uwx_ttrace.c
index a506ed06e3e8..19060216a23a 100644
--- a/sys/contrib/ia64/libuwx/src/uwx_ttrace.c
+++ b/sys/contrib/ia64/libuwx/src/uwx_ttrace.c
@@ -249,22 +249,22 @@ int uwx_ttrace_copyin(
if (info->have_ucontext) {
if (regid < UWX_REG_GR(0)) {
switch (regid) {
- case UWX_REG_PFS:
- status = __uc_get_ar(&info->ucontext, 64, dp);
- break;
case UWX_REG_PREDS:
status = __uc_get_prs(&info->ucontext, dp);
break;
- case UWX_REG_RNAT:
+ case UWX_REG_AR_PFS:
+ status = __uc_get_ar(&info->ucontext, 64, dp);
+ break;
+ case UWX_REG_AR_RNAT:
status = __uc_get_ar(&info->ucontext, 19, dp);
break;
- case UWX_REG_UNAT:
+ case UWX_REG_AR_UNAT:
status = __uc_get_ar(&info->ucontext, 36, dp);
break;
- case UWX_REG_FPSR:
+ case UWX_REG_AR_FPSR:
status = __uc_get_ar(&info->ucontext, 40, dp);
break;
- case UWX_REG_LC:
+ case UWX_REG_AR_LC:
status = __uc_get_ar(&info->ucontext, 65, dp);
break;
default:
@@ -283,22 +283,22 @@ int uwx_ttrace_copyin(
else {
if (regid < UWX_REG_GR(0)) {
switch (regid) {
- case UWX_REG_PFS:
- ttreg = __ar_pfs;
- break;
case UWX_REG_PREDS:
ttreg = __pr;
break;
- case UWX_REG_RNAT:
+ case UWX_REG_AR_PFS:
+ ttreg = __ar_pfs;
+ break;
+ case UWX_REG_AR_RNAT:
ttreg = __ar_rnat;
break;
- case UWX_REG_UNAT:
+ case UWX_REG_AR_UNAT:
ttreg = __ar_unat;
break;
- case UWX_REG_FPSR:
+ case UWX_REG_AR_FPSR:
ttreg = __ar_fpsr;
break;
- case UWX_REG_LC:
+ case UWX_REG_AR_LC:
ttreg = __ar_lc;
break;
default: