1 files changed, 0 insertions, 164 deletions
diff --git a/sys/cddl/dev/dtrace/i386/dtrace_asm.S b/sys/cddl/dev/dtrace/i386/dtrace_asm.S
index 6338719..d44f6c3 100644
--- a/sys/cddl/dev/dtrace/i386/dtrace_asm.S
+++ b/sys/cddl/dev/dtrace/i386/dtrace_asm.S
@@ -355,167 +355,3 @@ void dtrace_interrupt_enable(dtrace_icookie_t cookie)
 	popfl
 	ret
 	END(dtrace_interrupt_enable)
-
-/*
- * The panic() and cmn_err() functions invoke vpanic() as a common entry point
- * into the panic code implemented in panicsys().  vpanic() is responsible
- * for passing through the format string and arguments, and constructing a
- * regs structure on the stack into which it saves the current register
- * values.  If we are not dying due to a fatal trap, these registers will
- * then be preserved in panicbuf as the current processor state.  Before
- * invoking panicsys(), vpanic() activates the first panic trigger (see
- * common/os/panic.c) and switches to the panic_stack if successful.  Note that
- * DTrace takes a slightly different panic path if it must panic from probe
- * context.  Instead of calling panic, it calls into dtrace_vpanic(), which
- * sets up the initial stack as vpanic does, calls dtrace_panic_trigger(), and
- * branches back into vpanic().
- */
-/*
-void vpanic(const char *format, va_list alist)
-*/
-	ENTRY(vpanic)				/* Initial stack layout: */
-
-	pushl	%ebp				/* | %eip | 20 */
-	movl	%esp, %ebp			/* | %ebp | 16 */
-	pushl	%eax				/* | %eax | 12 */
-	pushl	%ebx				/* | %ebx |  8 */
-	pushl	%ecx				/* | %ecx |  4 */
-	pushl	%edx				/* | %edx |  0 */
-
-	movl	%esp, %ebx			/* %ebx = current stack pointer */
-
-	lea	panic_quiesce, %eax		/* %eax = &panic_quiesce */
-	pushl	%eax				/* push &panic_quiesce */
-	call	panic_trigger			/* %eax = panic_trigger() */
-	addl	$4, %esp			/* reset stack pointer */
-
-vpanic_common:
-	cmpl	$0, %eax			/* if (%eax == 0) */
-	je	0f				/*   goto 0f; */
-
-	/*
-	 * If panic_trigger() was successful, we are the first to initiate a
-	 * panic: we now switch to the reserved panic_stack before continuing.
-	 */
-	lea	panic_stack, %esp		/* %esp  = panic_stack */
-	addl	$PANICSTKSIZE, %esp		/* %esp += PANICSTKSIZE */
-
-0:	subl	$REGSIZE, %esp			/* allocate struct regs */
-
-	/*
-	 * Now that we've got everything set up, store the register values as
-	 * they were when we entered vpanic() to the designated location in
-	 * the regs structure we allocated on the stack. 
-	 */
-#ifdef notyet
-	mov	%gs, %edx
-	mov	%edx, REGOFF_GS(%esp)
-	mov	%fs, %edx
-	mov	%edx, REGOFF_FS(%esp)
-	mov	%es, %edx
-	mov	%edx, REGOFF_ES(%esp)
-	mov	%ds, %edx
-	mov	%edx, REGOFF_DS(%esp)
-	movl	%edi, REGOFF_EDI(%esp)
-	movl	%esi, REGOFF_ESI(%esp)
-	movl	16(%ebx), %ecx
-	movl	%ecx, REGOFF_EBP(%esp)
-	movl	%ebx, %ecx
-	addl	$20, %ecx
-	movl	%ecx, REGOFF_ESP(%esp)
-	movl	8(%ebx), %ecx
-	movl	%ecx, REGOFF_EBX(%esp)
-	movl	0(%ebx), %ecx
-	movl	%ecx, REGOFF_EDX(%esp)
-	movl	4(%ebx), %ecx
-	movl	%ecx, REGOFF_ECX(%esp)
-	movl	12(%ebx), %ecx
-	movl	%ecx, REGOFF_EAX(%esp)
-	movl	$0, REGOFF_TRAPNO(%esp)
-	movl	$0, REGOFF_ERR(%esp)
-	lea	vpanic, %ecx
-	movl	%ecx, REGOFF_EIP(%esp)
-	mov	%cs, %edx
-	movl	%edx, REGOFF_CS(%esp)
-	pushfl
-	popl	%ecx
-	movl	%ecx, REGOFF_EFL(%esp)
-	movl	$0, REGOFF_UESP(%esp)
-	mov	%ss, %edx
-	movl	%edx, REGOFF_SS(%esp)
-
-	movl	%esp, %ecx			/* %ecx = &regs */
-	pushl	%eax				/* push on_panic_stack */
-	pushl	%ecx				/* push &regs */
-	movl	12(%ebp), %ecx			/* %ecx = alist */
-	pushl	%ecx				/* push alist */
-	movl	8(%ebp), %ecx			/* %ecx = format */
-	pushl	%ecx				/* push format */
-	call	panicsys			/* panicsys(); */
-	addl	$16, %esp			/* pop arguments */
-
-	addl	$REGSIZE, %esp
-#endif
-	popl	%edx
-	popl	%ecx
-	popl	%ebx
-	popl	%eax
-	leave
-	ret
-	END(vpanic)
-
-/*
-void dtrace_vpanic(const char *format, va_list alist)
-*/
-	ENTRY(dtrace_vpanic)			/* Initial stack layout: */
-
-	pushl	%ebp				/* | %eip | 20 */
-	movl	%esp, %ebp			/* | %ebp | 16 */
-	pushl	%eax				/* | %eax | 12 */
-	pushl	%ebx				/* | %ebx |  8 */
-	pushl	%ecx				/* | %ecx |  4 */
-	pushl	%edx				/* | %edx |  0 */
-
-	movl	%esp, %ebx			/* %ebx = current stack pointer */
-
-	lea	panic_quiesce, %eax		/* %eax = &panic_quiesce */
-	pushl	%eax				/* push &panic_quiesce */
-	call	dtrace_panic_trigger		/* %eax = dtrace_panic_trigger() */
-	addl	$4, %esp			/* reset stack pointer */
-	jmp	vpanic_common			/* jump back to common code */
-
-	END(dtrace_vpanic)
-
-/*
-int
-panic_trigger(int *tp)
-*/
-	ENTRY(panic_trigger)
-	xorl	%eax, %eax
-	movl	$0xdefacedd, %edx
-	lock
-	  xchgl	%edx, (%edi)
-	cmpl	$0, %edx
-	je	0f 
-	movl	$0, %eax
-	ret
-0:	movl	$1, %eax
-	ret
-	END(panic_trigger)
-	
-/*
-int
-dtrace_panic_trigger(int *tp)
-*/
-	ENTRY(dtrace_panic_trigger)
-	xorl	%eax, %eax
-	movl	$0xdefacedd, %edx
-	lock
-	  xchgl	%edx, (%edi)
-	cmpl	$0, %edx
-	je	0f
-	movl	$0, %eax
-	ret
-0:	movl	$1, %eax
-	ret
-	END(dtrace_panic_trigger)