2007-01-31 Martin Hunt <hunt@redhat.com>

	* string.c (_stp_string_init): Deleted.
	(_stp_sprintf): Deleted.
	(_stp_vsprintf): Deleted.
	(_stp_string_cat_cstr): Deleted.
	(_stp_string_cat_string): Deleted.
	(_stp_string_cat_char): Deleted.
	(_stp_string_ptr): Deleted.
	(_stp_string_cat): Deleted.
	(_stp_snprintf): Moved from vsprintf.c.
	(_stp_vscnprintf): Moved from vsprintf.c.

	* string.h (STP_STRING_SIZE): Deleted.
	(STP_NUM_STRINGS): Deleted.
	Remove all references to type "String".

        * vsprintf.c (_stp_vscnprintf): Moved to string.c.
	(_stp_snprintf): Moved to string.c

	* sym.c (_stp_symbol_sprint): Replaced with
	_stp_symbol_print, which writes to the print buffer.
	(_stp_symbol_sprint_basic): Replaced with
	_stp_symbol_snprint.

	* runtime.h: Include io.c.

	* stat-common.c: Use new _stp_print* functions.
	* stat.c: Ditto.

	* regs.c: Renamed to regs-ia64.c.
	* current.c: Renamed regs.c.
	* regs-ia64.c: New file (renamed from regs.c).

	* stack.c (_stp_stack_sprint): Renamed _stp_stack_print
	and now just prints to the print buffer. Calls
	__stp_stack_print instead of __stp_stack_sprint.
	(_stp_stack_snprint): New function. Calls _stp_stack_print and
	then copies the print buffer into a string.
	(_stp_stack_printj): Deleted.
	(_stp_ustack_sprint): Deleted.
	* stack-*.c: Rewritten to print instead of writing to strings.
	Uses new _stp_print* functions.

	* print.c (_stp_printf): Create new function instead of macro.
	(_stp_print): Ditto.
	(_stp_print_char): New function.

	* map.c: Use _stp_print() and _stp_print_char()
	instead of _stp_print_cstr().

	* io.c (_stp_vlog): Use _stp_print() instead
	of _stp_string_cat_cstr().

	* copy.c (_stp_string_from_user): Deleted.

1 files changed, 0 insertions, 257 deletions

diff --git a/runtime/current.c b/runtime/current.c
deleted file mode 100644
index 809f253b..00000000
--- a/runtime/current.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* -*- linux-c -*- 
- * Functions to access the members of pt_regs struct
- * Copyright (C) 2005 Red Hat Inc.
- * Copyright (C) 2005 Intel Corporation.
- *
- * This file is part of systemtap, and is free software.  You can
- * redistribute it and/or modify it under the terms of the GNU General
- * Public License (GPL); either version 2, or (at your option) any
- * later version.
- */
-
-#ifndef _CURRENT_C_ /* -*- linux-c -*- */
-#define _CURRENT_C_
-
-#include "regs.h"
-
-/** @file current.c
- * @brief Functions to get the current state.
- */
-/** @addtogroup current Current State
- * Functions to get the current state.
- * @{
- */
-
-
-/** Get the current return address.
- * Call from kprobes (not jprobes).
- * @param regs The pt_regs saved by the kprobe.
- * @return The return address saved in the stack pointer.
- * @note i386 and x86_64 only so far.
- */
- 
-unsigned long _stp_ret_addr (struct pt_regs *regs)
-{
-#ifdef __x86_64__
-	unsigned long *ra = (unsigned long *)regs->rsp;
-	if (ra)
-		return *ra;
-	else
-		return 0;
-#elif defined (__i386__)
-	return regs->esp;
-#elif defined (__powerpc64__)
-	return REG_LINK(regs);
-#elif defined (__ia64__)
-	return regs->b0;
-#elif defined (__s390__) || defined (__s390x__)
-	return regs->gprs[14];
-#else
-	#error Unimplemented architecture
-#endif
-}
-
-/** Get the current return address for a return probe.
- * Call from kprobe return probe.
- * @param ri Pointer to the struct kretprobe_instance.
- * @return The return address
- */
-#define _stp_ret_addr_r(ri) (ri->ret_addr)
-
-/** Get the probe address for a kprobe.
- * Call from a kprobe. This will return the
- * address of the function that is being probed.
- * @param kp Pointer to the struct kprobe.
- * @return The function's address
- */
-#define _stp_probe_addr(kp) (kp->addr)
-
-/** Get the probe address for a return probe.
- * Call from kprobe return probe. This will return the
- * address of the function that is being probed.
- * @param ri Pointer to the struct kretprobe_instance.
- * @return The function's address
- */
-#define _stp_probe_addr_r(ri) (ri->rp->kp.addr)
-
-#ifdef  __x86_64__
-void _stp_sprint_regs(String str, struct pt_regs * regs)
-{
-        unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L, fs, gs, shadowgs;
-        unsigned int fsindex,gsindex;
-        unsigned int ds,cs,es;
-
-        _stp_sprintf(str,"RIP: %016lx\nRSP: %016lx  EFLAGS: %08lx\n", regs->rip, regs->rsp, regs->eflags);
-        _stp_sprintf(str,"RAX: %016lx RBX: %016lx RCX: %016lx\n",
-               regs->rax, regs->rbx, regs->rcx);
-        _stp_sprintf(str,"RDX: %016lx RSI: %016lx RDI: %016lx\n",
-               regs->rdx, regs->rsi, regs->rdi);
-        _stp_sprintf(str,"RBP: %016lx R08: %016lx R09: %016lx\n",
-               regs->rbp, regs->r8, regs->r9);
-        _stp_sprintf(str,"R10: %016lx R11: %016lx R12: %016lx\n",
-               regs->r10, regs->r11, regs->r12);
-        _stp_sprintf(str,"R13: %016lx R14: %016lx R15: %016lx\n",
-               regs->r13, regs->r14, regs->r15);
-
-        asm("movl %%ds,%0" : "=r" (ds));
-        asm("movl %%cs,%0" : "=r" (cs));
-        asm("movl %%es,%0" : "=r" (es));
-        asm("movl %%fs,%0" : "=r" (fsindex));
-        asm("movl %%gs,%0" : "=r" (gsindex));
-
-        rdmsrl(MSR_FS_BASE, fs);
-        rdmsrl(MSR_GS_BASE, gs);
-        rdmsrl(MSR_KERNEL_GS_BASE, shadowgs);
-
-        asm("movq %%cr0, %0": "=r" (cr0));
-        asm("movq %%cr2, %0": "=r" (cr2));
-        asm("movq %%cr3, %0": "=r" (cr3));
-        asm("movq %%cr4, %0": "=r" (cr4));
-
-        _stp_sprintf(str,"FS:  %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",
-               fs,fsindex,gs,gsindex,shadowgs);
-        _stp_sprintf(str,"CS:  %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds, es, cr0);
-        _stp_sprintf(str,"CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3, cr4);
-}
-
-#elif defined (__ia64__)
-void _stp_sprint_regs(String str, struct pt_regs * regs)
-{
-     unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
-
-	_stp_sprintf(str, "\nPid: %d, CPU %d, comm: %20s\n", current->pid,
-		smp_processor_id(), current->comm);
-	_stp_sprintf(str, "psr : %016lx ifs : %016lx ip  : [<%016lx>]  \n",
-		regs->cr_ipsr, regs->cr_ifs, ip);
-	_stp_sprintf(str, "unat: %016lx pfs : %016lx rsc : %016lx\n",
-		regs->ar_unat, regs->ar_pfs, regs->ar_rsc);
-	_stp_sprintf(str, "rnat: %016lx bsps: %016lx pr  : %016lx\n",
-		regs->ar_rnat, regs->ar_bspstore, regs->pr);
-	_stp_sprintf(str, "ldrs: %016lx ccv : %016lx fpsr: %016lx\n",
-		regs->loadrs, regs->ar_ccv, regs->ar_fpsr);
-	_stp_sprintf(str, "csd : %016lx ssd : %016lx\n",
-		regs->ar_csd, regs->ar_ssd);
-	_stp_sprintf(str, "b0  : %016lx b6  : %016lx b7  : %016lx\n",
-		regs->b0, regs->b6, regs->b7);
-	_stp_sprintf(str, "f6  : %05lx%016lx f7  : %05lx%016lx\n",
-		regs->f6.u.bits[1], regs->f6.u.bits[0],
-		regs->f7.u.bits[1], regs->f7.u.bits[0]);
-	_stp_sprintf(str, "f8  : %05lx%016lx f9  : %05lx%016lx\n",
-		regs->f8.u.bits[1], regs->f8.u.bits[0],
-		regs->f9.u.bits[1], regs->f9.u.bits[0]);
-	_stp_sprintf(str, "f10 : %05lx%016lx f11 : %05lx%016lx\n",
-		regs->f10.u.bits[1], regs->f10.u.bits[0],
-		regs->f11.u.bits[1], regs->f11.u.bits[0]);
-}
-
-#elif defined (__i386__)
-
-/** Write the registers to a string.
- * @param regs The pt_regs saved by the kprobe.
- * @note i386 and x86_64 only so far. 
- */
-void _stp_sprint_regs(String str, struct pt_regs * regs)
-{
-	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
-	
-	_stp_sprintf (str, "EIP: %08lx\n",regs->eip);
-	_stp_sprintf (str, "ESP: %08lx\n",regs->esp);
-	_stp_sprintf (str, "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
-		      regs->eax,regs->ebx,regs->ecx,regs->edx);
-	_stp_sprintf (str, "ESI: %08lx EDI: %08lx EBP: %08lx",
-		      regs->esi, regs->edi, regs->ebp);
-	_stp_sprintf (str, " DS: %04x ES: %04x\n",
-		      0xffff & regs->xds,0xffff & regs->xes);
-	
-	__asm__("movl %%cr0, %0": "=r" (cr0));
-	__asm__("movl %%cr2, %0": "=r" (cr2));
-	__asm__("movl %%cr3, %0": "=r" (cr3));
-	/* This could fault if %cr4 does not exist */
-	__asm__("1: movl %%cr4, %0		\n"
-		"2:				\n"
-		".section __ex_table,\"a\"	\n"
-		".long 1b,2b			\n"
-		".previous			\n"
-		: "=r" (cr4): "0" (0));
-	_stp_sprintf (str, "CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n", cr0, cr2, cr3, cr4);
-}
-
-#elif defined (__powerpc64__)
-
-void _stp_sprint_regs(String str, struct pt_regs * regs)
-{
-	int i;
-
-	_stp_sprintf(str, "NIP: %016lX XER: %08X LR: %016lX CTR: %016lX\n",
-	       regs->nip, (unsigned int)regs->xer, regs->link, regs->ctr);
-	_stp_sprintf(str, "REGS: %p TRAP: %04lx\n", regs, regs->trap);
-	_stp_sprintf(str, "MSR: %016lx CR: %08X\n",
-			regs->msr, (unsigned int)regs->ccr);
-	_stp_sprintf(str, "DAR: %016lx DSISR: %016lx\n",
-		       	regs->dar, regs->dsisr);
-
-#ifdef CONFIG_SMP
-	_stp_sprintf(str, " CPU: %d", smp_processor_id());
-#endif /* CONFIG_SMP */
-
-	for (i = 0; i < 32; i++) {
-		if ((i % 4) == 0) {
-			_stp_sprintf(str, "\n GPR%02d: ", i);
-		}
-
-		_stp_sprintf(str, "%016lX ", regs->gpr[i]);
-		if (i == 13 && !FULL_REGS(regs))
-			break;
-	}
-	_stp_string_cat(str, "\n");
-	_stp_sprintf(str, "NIP [%016lx] ", regs->nip);
-	_stp_sprintf(str, "LR [%016lx] ", regs->link);
-	_stp_string_cat(str, regs->link);
-	_stp_string_cat(str, "\n");
-}
-
-#elif defined (__s390x__) || defined (__s390__)
-
-#ifdef __s390x__
-#define GPRSIZE "%016lX "
-#else	/* s390 */
-#define GPRSIZE "%08lX "
-#endif
-
-void _stp_sprint_regs(String str, struct pt_regs * regs)
-{
-	char *mode;
-	int i;
-
-	mode = (regs->psw.mask & PSW_MASK_PSTATE) ? "User" : "Krnl";
-	_stp_sprintf(str,"%s PSW : ["GPRSIZE"] ["GPRSIZE"]",
-		mode, (void *) regs->psw.mask,
-		(void *) regs->psw.addr);
-
-#ifdef CONFIG_SMP
-	_stp_sprintf(str, " CPU: %d", smp_processor_id());
-#endif /* CONFIG_SMP */
-
-	for (i = 0; i < 16; i++) {
-		if ((i % 4) == 0) {
-			_stp_sprintf(str, "\n GPRS%02d: ", i);
-		}
-		_stp_sprintf(str, GPRSIZE, regs->gprs[i]);
-	}
-	_stp_string_cat(str, "\n");
-}
-
-#endif
-
-/** Print the registers.
- * @param regs The pt_regs saved by the kprobe.
- * @note i386 and x86_64 only so far.
- */
-#define _stp_print_regs(regs)				\
-	{						\
-		_stp_sprint_regs(_stp_stdout,regs);	\
-		_stp_print_flush();			\
-	}
-
-/** @} */
-#endif /* _CURRENT_C_ */