[Openmcl-cvs-notifications] r9905 - in /trunk/source/lisp-kernel: lisp-debug.c plbt.c ppc-constants.h ppc-exceptions.c ppc-gc.c ppc_print.c
gb at clozure.com
gb at clozure.com
Sun Jul 6 20:27:58 EDT 2008
Author: gb
Date: Sun Jul 6 20:27:58 2008
New Revision: 9905
Log:
Clean up unused variables, some other things which -Wall complains about.
Modified:
trunk/source/lisp-kernel/lisp-debug.c
trunk/source/lisp-kernel/plbt.c
trunk/source/lisp-kernel/ppc-constants.h
trunk/source/lisp-kernel/ppc-exceptions.c
trunk/source/lisp-kernel/ppc-gc.c
trunk/source/lisp-kernel/ppc_print.c
Modified: trunk/source/lisp-kernel/lisp-debug.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/lisp-debug.c (original)
+++ trunk/source/lisp-kernel/lisp-debug.c Sun Jul 6 20:27:58 2008
@@ -181,15 +181,12 @@
describe_ppc_illegal(ExceptionInformation *xp)
{
pc where =3D xpPC(xp);
- opcode the_uuo =3D *where, instr2;
+ opcode the_uuo =3D *where;
Boolean described =3D false;
=
if (IS_UUO(the_uuo)) {
unsigned =
minor =3D UUO_MINOR(the_uuo),
- rt =3D 0x1f & (the_uuo >> 21),
- ra =3D 0x1f & (the_uuo >> 16),
- rb =3D 0x1f & (the_uuo >> 11),
errnum =3D 0x3ff & (the_uuo >> 16);
=
switch(minor) {
@@ -225,8 +222,7 @@
{
pc where =3D xpPC(xp);
opcode the_trap =3D *where, instr;
- int err_arg1, err_arg2, ra, rs;
- char *name =3D NULL;
+ int err_arg2, ra, rs;
Boolean identified =3D false;
=
if ((the_trap & OP_MASK) =3D=3D OP(major_opcode_TRI)) {
@@ -589,7 +585,7 @@
{
=
#ifdef PPC
- int a, b, c, d, i;
+ int a, b, c, d;;
#ifdef PPC64
for (a =3D 0, b =3D 16; a < 16; a++, b++) {
fprintf(stderr,"r%02d =3D 0x%016lX r%02d =3D 0x%016lX\n",
@@ -644,8 +640,8 @@
dp =3D xpFPRvector(xp);
np =3D (int *) dp;
=
- for (i =3D 0; i < 32; i++) {
- fprintf(stderr, "f%02d : 0x%08X%08X (%f)\n", i, *np++, *np++, *dp++);
+ for (i =3D 0; i < 32; i++, np+=3D2) {
+ fprintf(stderr, "f%02d : 0x%08X%08X (%f)\n", i, np[0], np[1], *dp++);
}
fprintf(stderr, "FPSCR =3D %08X\n", xpFPSCR(xp));
#endif
Modified: trunk/source/lisp-kernel/plbt.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/plbt.c (original)
+++ trunk/source/lisp-kernel/plbt.c Sun Jul 6 20:27:58 2008
@@ -319,25 +319,3 @@
plbt_sp(xpGPR(xp, sp));
}
=
-const char *
-foreign_name_and_offset(void *frame, unsigned *delta)
-{
- Dl_info info;
-#if defined(LINUX) && !defined(PPC64)
- void *pc =3D (void *) (((eabi_c_frame *)frame)->savelr);
-#else
- void *pc =3D (void *) (((c_frame *)frame)->savelr);
-#endif
-#ifndef STATIC
- if (dladdr(pc, &info)) {
- if (delta) {
- *delta =3D (unsigned long )pc - (unsigned long)info.dli_saddr;
- }
- return info.dli_sname;
- }
-#endif
- if (delta) {
- *delta =3D 0;
- }
- return NULL;
-}
Modified: trunk/source/lisp-kernel/ppc-constants.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/ppc-constants.h (original)
+++ trunk/source/lisp-kernel/ppc-constants.h Sun Jul 6 20:27:58 2008
@@ -82,7 +82,7 @@
#endif
=
#define dnode_size (node_size*2)
-#define dnode_shift node_shift+1
+#define dnode_shift (node_shift+1)
=
#define INTERRUPT_LEVEL_BINDING_INDEX (1)
=
Modified: trunk/source/lisp-kernel/ppc-exceptions.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/ppc-exceptions.c (original)
+++ trunk/source/lisp-kernel/ppc-exceptions.c Sun Jul 6 20:27:58 2008
@@ -691,7 +691,6 @@
signed_natural param)
{
TCR *tcr =3D TCR_FROM_TSD(xpGPR(xp, rcontext)), *other_tcr;
- ExceptionInformation* other_xp;
int result;
signed_natural inhibit;
=
@@ -1225,7 +1224,6 @@
siginfo_t *info,
int old_valence)
{
- unsigned oldMQ;
OSStatus status =3D -1;
pc program_counter;
opcode instruction =3D 0;
@@ -1279,7 +1277,7 @@
handle_fpux_binop(ExceptionInformation *xp, pc where)
{
OSStatus err;
- opcode *there =3D (opcode *) where, instr, errnum;
+ opcode *there =3D (opcode *) where, instr, errnum =3D 0;
int i =3D TRAP_LOOKUP_TRIES, delta =3D 0;
=
while (i--) {
@@ -1317,8 +1315,6 @@
#endif
unsigned =
minor =3D UUO_MINOR(the_uuo),
- rt =3D 0x1f & (the_uuo >> 21),
- ra =3D 0x1f & (the_uuo >> 16),
rb =3D 0x1f & (the_uuo >> 11),
errnum =3D 0x3ff & (the_uuo >> 16);
=
@@ -1436,8 +1432,7 @@
callback_to_lisp (LispObj callback_macptr, ExceptionInformation *xp,
natural arg1, natural arg2, natural arg3, natural arg4, =
natural arg5)
{
- sigset_t mask;
- natural callback_ptr, i;
+ natural callback_ptr;
area *a;
=
TCR *tcr =3D TCR_FROM_TSD(xpGPR(xp, rcontext));
@@ -1497,13 +1492,7 @@
OSStatus
handle_trap(ExceptionInformation *xp, opcode the_trap, pc where, siginfo_t=
*info)
{
- unsigned instr, err_arg1 =3D 0, err_arg2 =3D 0, err_arg3 =3D 0;
- int ra, rs, fn_reg =3D 0;
- char * error_msg =3D NULL;
- char name[kNameBufLen];
LispObj cmain =3D nrs_CMAIN.vcell;
- Boolean event_poll_p =3D false;
- int old_interrupt_level =3D 0;
TCR *tcr =3D TCR_FROM_TSD(xpGPR(xp, rcontext));
=
/* If we got here, "the_trap" is either a TRI or a TR instruction.
@@ -1684,7 +1673,6 @@
OSStatus
handle_error(ExceptionInformation *xp, unsigned errnum, unsigned rb, unsig=
ned continuable, pc where)
{
- LispObj pname;
LispObj errdisp =3D nrs_ERRDISP.vcell;
=
if ((fulltag_of(errdisp) =3D=3D fulltag_misc) &&
@@ -1864,7 +1852,7 @@
=
if ((program_counter < &egc_write_barrier_end) && =
(program_counter >=3D &egc_write_barrier_start)) {
- LispObj *ea =3D 0, val, root;
+ LispObj *ea =3D 0, val =3D 0, root =3D 0;
bitvector refbits =3D (bitvector)(lisp_global(REFBITS));
Boolean need_store =3D true, need_check_memo =3D true, need_memoize_ro=
ot =3D false;
=
@@ -2380,7 +2368,6 @@
void
restore_mach_thread_state(mach_port_t thread, ExceptionInformation *pseudo=
sigcontext)
{
- int i, j;
kern_return_t kret;
MCONTEXT_T mc =3D UC_MCONTEXT(pseudosigcontext);
=
@@ -2451,7 +2438,6 @@
#endif
mach_msg_type_number_t thread_state_count;
kern_return_t result;
- int i,j;
ExceptionInformation *pseudosigcontext;
MCONTEXT_T mc;
natural stackp, backlink;
@@ -2545,10 +2531,8 @@
#else
ppc_thread_state_t ts;
#endif
- mach_msg_type_number_t thread_state_count;
ExceptionInformation *pseudosigcontext;
- int i, j, old_valence =3D tcr->valence;
- kern_return_t result;
+ int old_valence =3D tcr->valence;
natural stackp;
=
#ifdef DEBUG_MACH_EXCEPTIONS
@@ -2987,7 +2971,6 @@
{
mach_port_t =
thread_exception_port =3D TCR_TO_EXCEPTION_PORT(tcr),
- target_thread =3D pthread_mach_thread_np((pthread_t)ptr_from_lispobj(t=
cr->osid)),
task_self =3D mach_task_self();
kern_return_t kret;
=
Modified: trunk/source/lisp-kernel/ppc-gc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/ppc-gc.c (original)
+++ trunk/source/lisp-kernel/ppc-gc.c Sun Jul 6 20:27:58 2008
@@ -120,7 +120,7 @@
void
check_range(LispObj *start, LispObj *end, Boolean header_allowed)
{
- LispObj node, *current =3D start, *prev;
+ LispObj node, *current =3D start, *prev =3D NULL;
int tag;
natural elements;
=
@@ -1782,7 +1782,7 @@
copy_ivector_reference(LispObj *ref, BytePtr low, BytePtr high, area *dest)
{
LispObj obj =3D *ref, header;
- natural tag =3D fulltag_of(obj), header_tag, header_subtag;
+ natural tag =3D fulltag_of(obj), header_tag;
=
if ((tag =3D=3D fulltag_misc) &&
(((BytePtr)ptr_from_lispobj(obj)) > low) &&
@@ -2052,7 +2052,6 @@
=
TCR *other_tcr;
natural max_pure_size;
- OSErr err;
BytePtr new_pure_start;
=
=
Modified: trunk/source/lisp-kernel/ppc_print.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/ppc_print.c (original)
+++ trunk/source/lisp-kernel/ppc_print.c Sun Jul 6 20:27:58 2008
@@ -231,8 +231,7 @@
lispsymbol *rawsym =3D (lispsymbol *) ptr_from_lispobj(untag(o));
LispObj =
pname =3D rawsym->pname,
- package =3D rawsym->package_predicate,
- pname_header =3D header_of(pname);
+ package =3D rawsym->package_predicate;
=
#ifdef PPC64
if (o =3D=3D lisp_nil) {
More information about the Openmcl-cvs-notifications
mailing list