From owner-p4-projects@FreeBSD.ORG Thu Apr 24 23:05:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEA8C37B404; Thu, 24 Apr 2003 23:05:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 45C6337B401 for ; Thu, 24 Apr 2003 23:05:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C94CC43FA3 for ; Thu, 24 Apr 2003 23:05:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3P65p0U051111 for ; Thu, 24 Apr 2003 23:05:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3P65pbf051102 for perforce@freebsd.org; Thu, 24 Apr 2003 23:05:51 -0700 (PDT) Date: Thu, 24 Apr 2003 23:05:51 -0700 (PDT) Message-Id: <200304250605.h3P65pbf051102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 29672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Apr 2003 06:05:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=29672 Change 29672 by peter@peter_daintree on 2003/04/24 23:05:36 use movq instead of pushq so as to be insulated from trapframe reodering Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/icu_vector.s#9 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/icu_vector.s#9 (text+ko) ==== @@ -24,23 +24,22 @@ .text ; \ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ - pushq $0 ; /* dummy error code */ \ - pushq $0 ; /* dummy trap type */ \ - pushq %rax ; \ - pushq %rcx ; \ - pushq %rdx ; \ - pushq %rbx ; \ - pushq %rbp ; \ - pushq %rsi ; \ - pushq %rdi ; \ - pushq %r8 ; \ - pushq %r9 ; \ - pushq %r10 ; \ - pushq %r11 ; \ - pushq %r12 ; \ - pushq %r13 ; \ - pushq %r14 ; \ - pushq %r15 ; \ + subq $TF_RIP,%rsp ; /* skip dummy tf_err and tf_trapno */ \ + movq %rax,TF_RAX(%rsp) ; \ + movq %rcx,TF_RCX(%rsp) ; \ + movq %rdx,TF_RDX(%rsp) ; \ + movq %rbx,TF_RBX(%rsp) ; \ + movq %rbp,TF_RBP(%rsp) ; \ + movq %rsi,TF_RSI(%rsp) ; \ + movq %rdi,TF_RDI(%rsp) ; \ + movq %r8,TF_R8(%rsp) ; \ + movq %r9,TF_R9(%rsp) ; \ + movq %r10,TF_R10(%rsp) ; \ + movq %r11,TF_R11(%rsp) ; \ + movq %r12,TF_R12(%rsp) ; \ + movq %r13,TF_R13(%rsp) ; \ + movq %r14,TF_R14(%rsp) ; \ + movq %r15,TF_R15(%rsp) ; \ FAKE_MCOUNT((12)*4(%rsp)) ; \ call critical_enter ; \ movq PCPU(CURTHREAD),%rbx ; \ @@ -69,23 +68,22 @@ .text ; \ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ - pushq $0 ; /* dummy error code */ \ - pushq $0 ; /* dummy trap type */ \ - pushq %rax ; \ - pushq %rcx ; \ - pushq %rdx ; \ - pushq %rbx ; \ - pushq %rbp ; \ - pushq %rsi ; \ - pushq %rdi ; \ - pushq %r8 ; \ - pushq %r9 ; \ - pushq %r10 ; \ - pushq %r11 ; \ - pushq %r12 ; \ - pushq %r13 ; \ - pushq %r14 ; \ - pushq %r15 ; \ + subq $TF_RIP,%rsp ; /* skip dummy tf_err and tf_trapno */ \ + movq %rax,TF_RAX(%rsp) ; \ + movq %rcx,TF_RCX(%rsp) ; \ + movq %rdx,TF_RDX(%rsp) ; \ + movq %rbx,TF_RBX(%rsp) ; \ + movq %rbp,TF_RBP(%rsp) ; \ + movq %rsi,TF_RSI(%rsp) ; \ + movq %rdi,TF_RDI(%rsp) ; \ + movq %r8,TF_R8(%rsp) ; \ + movq %r9,TF_R9(%rsp) ; \ + movq %r10,TF_R10(%rsp) ; \ + movq %r11,TF_R11(%rsp) ; \ + movq %r12,TF_R12(%rsp) ; \ + movq %r13,TF_R13(%rsp) ; \ + movq %r14,TF_R14(%rsp) ; \ + movq %r15,TF_R15(%rsp) ; \ maybe_extra_ipending ; \ movb imen + IRQ_BYTE(irq_num),%al ; \ orb $IRQ_BIT(irq_num),%al ; \