From be1aa469293700c1a79701e20df4831b458e678f Mon Sep 17 00:00:00 2001 From: tomo Date: Mon, 17 May 1999 09:43:52 +0000 Subject: [PATCH] XEmacs 21.2.14. --- lib-src/run.c | 3 --- lib-src/update-elc.sh | 3 +-- nt/inc/sys/file.h | 3 +++ src/dbxrc | 41 ++++++++++------------------------------- src/gdbinit | 35 +++++++++++------------------------ 5 files changed, 25 insertions(+), 60 deletions(-) diff --git a/lib-src/run.c b/lib-src/run.c index f3830ed..86830ba 100644 --- a/lib-src/run.c +++ b/lib-src/run.c @@ -121,7 +121,6 @@ int start_child(char* cmdline, int wait_for_child) { STARTUPINFO start; SECURITY_ATTRIBUTES sec_attrs; - SECURITY_DESCRIPTOR sec_desc; PROCESS_INFORMATION child; int retval; @@ -240,7 +239,6 @@ void process_execname(char *exec, const char* execname,const char* execpath ) char buf[MAX_PATH + FILENAME_MAX + 100]; int i,j; - int len = 0; /* * STARTS WITH / or \ * execpath NOT used @@ -625,7 +623,6 @@ char *pfopen(char *retval, const char *name, const char *dirs) char *ptr; char *tdirs; char returnval[MAX_PATH + FILENAME_MAX + 100]; - char *recursive_name; int foundit = FALSE; returnval[0] = '\0'; diff --git a/lib-src/update-elc.sh b/lib-src/update-elc.sh index ce9e11c..5d3f461 100644 --- a/lib-src/update-elc.sh +++ b/lib-src/update-elc.sh @@ -106,7 +106,7 @@ lisp_prog='(princ (featurep (quote mule)))' mule_p="`$EMACS -batch -vanilla -eval \"$lisp_prog\"`" if test "$mule_p" = nil ; then echo No - ignore_dirs="$ignore=dirs mule" + ignore_dirs="$ignore_dirs mule" else echo Yes fi @@ -176,7 +176,6 @@ ignore_pattern="$ignore_pattern"' \!/site-init.el$!d \!/version.el$!d \!/very-early-lisp.el$!d -\!/Installation.el$!d ' echo "Compiling files without .elc..." diff --git a/nt/inc/sys/file.h b/nt/inc/sys/file.h index 8536d03..238d83b 100644 --- a/nt/inc/sys/file.h +++ b/nt/inc/sys/file.h @@ -3,6 +3,9 @@ */ #define F_OK 0 +#ifdef X_OK +#undef X_OK +#endif #define X_OK 1 #define W_OK 2 #define R_OK 4 diff --git a/src/dbxrc b/src/dbxrc index a757115..bae532e 100644 --- a/src/dbxrc +++ b/src/dbxrc @@ -59,9 +59,7 @@ function ldp { # A bug in dbx prevents string variables from having values beginning with `-'!! function XEmacsInit { function ToInt { eval "$1=\$[(int) $1]"; } - ToInt dbg_USE_MINIMAL_TAGBITS ToInt dbg_USE_UNION_TYPE - ToInt dbg_USE_INDEXED_LRECORD_IMPLEMENTATION ToInt Lisp_Type_Int ToInt Lisp_Type_Char ToInt Lisp_Type_Cons @@ -100,43 +98,24 @@ function decode_object { else obj="$[(unsigned long)($1)]"; fi - if test $dbg_USE_MINIMAL_TAGBITS = 1; then - if test $[(int)($obj & 1)] = 1; then - # It's an int - val=$[(long)(((unsigned long long)$obj) >> 1)] - type=$Lisp_Type_Int - else - type=$[(int)(((void*)$obj) & $dbg_typemask)] - if test $type = $Lisp_Type_Char; then - val=$[(void*)(long)(((unsigned long long)($obj & $dbg_valmask)) >> $dbg_gctypebits)] - else - # It's a record pointer - val=$[(void*)$obj] - if test "$val" = "(nil)"; then type=null_pointer; fi - fi - fi + if test $[(int)($obj & 1)] = 1; then + # It's an int + val=$[(long)(((unsigned long long)$obj) >> 1)] + type=$Lisp_Type_Int else - # not dbg_USE_MINIMAL_TAGBITS - type=$[(int)(((unsigned long long)($obj & $dbg_typemask)) >> ($dbg_valbits + 1))] - if test "$type" = $Lisp_Type_Int; then - val=$[(int)($obj & $dbg_valmask)] - elif test "$type" = $Lisp_Type_Char; then - val=$[(int)($obj & $dbg_valmask)] + type=$[(int)(((void*)$obj) & $dbg_typemask)] + if test $type = $Lisp_Type_Char; then + val=$[(void*)(long)(((unsigned long long)($obj & $dbg_valmask)) >> $dbg_gctypebits)] else - val=$[(void*)($obj & $dbg_valmask)] + # It's a record pointer + val=$[(void*)$obj] if test "$val" = "(nil)"; then type=null_pointer; fi fi - #val=$[(void*)($obj & $dbg_valmask)] - #printvar val type obj fi if test $type = $Lisp_Type_Record; then typeset lheader="((struct lrecord_header *) $val)" - if test $dbg_USE_INDEXED_LRECORD_IMPLEMENTATION = 1; then - imp=$[(void*)(lrecord_implementations_table[$lheader->type])] - else - imp=$[(void*)($lheader->implementation)] - fi + imp=$[(void*)(lrecord_implementations_table[$lheader->type])] else imp="0xdeadbeef" fi diff --git a/src/gdbinit b/src/gdbinit index 0259597..f9a8c7e 100644 --- a/src/gdbinit +++ b/src/gdbinit @@ -32,9 +32,6 @@ # specified: # USE_UNION_TYPE -# USE_MINIMAL_TAGBITS -# USE_INDEXED_LRECORD_IMPLEMENTATION -# LRECORD_(SYMBOL|STRING|VECTOR) # (the above all have configure equivalents) @@ -49,33 +46,23 @@ set print pretty off define decode_object set $obj = (unsigned long) $arg0 - if dbg_USE_MINIMAL_TAGBITS - if $obj & 1 - # It's an int - set $val = $obj >> 1 - set $type = Lisp_Type_Int + if $obj & 1 + # It's an int + set $val = $obj >> 1 + set $type = Lisp_Type_Int + else + set $type = $obj & dbg_typemask + if $type == Lisp_Type_Char + set $val = ($obj & dbg_valmask) >> dbg_gctypebits else - set $type = $obj & dbg_typemask - if $type == Lisp_Type_Char - set $val = ($obj & dbg_valmask) >> dbg_gctypebits - else - # It's a record pointer - set $val = $obj - end + # It's a record pointer + set $val = $obj end - else - # not dbg_USE_MINIMAL_TAGBITS - set $val = $obj & dbg_valmask - set $type = ($obj & dbg_typemask) >> (dbg_valbits + 1) end if $type == Lisp_Type_Record set $lheader = (struct lrecord_header *) $val - if dbg_USE_INDEXED_LRECORD_IMPLEMENTATION - set $imp = lrecord_implementations_table[$lheader->type] - else - set $imp = $lheader->implementation - end + set $imp = lrecord_implementations_table[$lheader->type] else set $imp = -1 end -- 1.7.10.4