From owner-svn-src-head@FreeBSD.ORG Tue Apr 23 21:25:42 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id AE18C1D4 for ; Tue, 23 Apr 2013 21:25:42 +0000 (UTC) (envelope-from juli@clockworksquid.com) Received: from mail-la0-x231.google.com (mail-la0-x231.google.com [IPv6:2a00:1450:4010:c03::231]) by mx1.freebsd.org (Postfix) with ESMTP id 38D561015 for ; Tue, 23 Apr 2013 21:25:42 +0000 (UTC) Received: by mail-la0-f49.google.com with SMTP id ei20so971073lab.22 for ; Tue, 23 Apr 2013 14:25:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :x-gm-message-state; bh=g2ekoiY5Tn5zRDt6AHVZ38xs78pGt8LM6PQsBFMMXy8=; b=bcHOpKR3pJJKu9rxIlPsECCGIRKTpdIoIXvhH+7iLKhwgSC5e29d7wCBAYK8IIc4C8 WAPPw10AtyodeqiTPtW5ymWiDMxJy+ZMGh+lHjuIWPuZ5Qzby8nwmRIH17ES0sWRG7MQ 0ViuNhV8RFcdlcljZXMcSkyjgcseHbG9TlIdnyojSBABT559RMl77YjV6nw9YzqP0SWC OTmHccHfx7TBf/WPTgtIQ3Pz62LWF9bCMj9QwoM2IzhB9LZMfrJiagI4Mfv0S5dzGiRw kPxZtkc/M3C3LdWykDE7UtwyAR2vSSn8DqsBCK3qBrTYSdVlYXIU0bMHv478H2nKfwqe 44wg== X-Received: by 10.112.164.97 with SMTP id yp1mr4644893lbb.6.1366752341031; Tue, 23 Apr 2013 14:25:41 -0700 (PDT) MIME-Version: 1.0 Sender: juli@clockworksquid.com Received: by 10.152.28.196 with HTTP; Tue, 23 Apr 2013 14:25:19 -0700 (PDT) In-Reply-To: <201304230938.r3N9cIV0047961@svn.freebsd.org> References: <201304230938.r3N9cIV0047961@svn.freebsd.org> From: Juli Mallett Date: Tue, 23 Apr 2013 14:25:19 -0700 X-Google-Sender-Auth: M5OWc_FpwAhfS7FfmuDpvr6zrSc Message-ID: Subject: Re: svn commit: r249790 - in head/sys/mips: include mips To: Warner Losh Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQl+2E/ELbzyh4D5ecL72G+KXsDZLGfftyamsjdlulCILasaadIzlb0sW8cLbcKTchbsMvbY Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Apr 2013 21:25:42 -0000 On Tue, Apr 23, 2013 at 2:38 AM, Warner Losh wrote: > Modified: head/sys/mips/include/frame.h > ============================================================================== > --- head/sys/mips/include/frame.h Tue Apr 23 06:37:50 2013 (r249789) > +++ head/sys/mips/include/frame.h Tue Apr 23 09:38:18 2013 (r249790) > @@ -37,6 +37,8 @@ > #ifndef _MACHINE_FRAME_H_ > #define _MACHINE_FRAME_H_ > > +/* Note: This must also match regnum.h and regdef.h */ > + > struct trapframe { > register_t zero; > register_t ast; > @@ -46,6 +48,16 @@ struct trapframe { > register_t a1; > register_t a2; > register_t a3; > +#if defined(__mips_n32) || defined(__mips_n64) > + register_t a4; > + register_t a5; > + register_t a6; > + register_t a7; > + register_t t0; > + register_t t1; > + register_t t2; > + register_t t3; > +#else > register_t t0; > register_t t1; > register_t t2; > @@ -54,6 +66,7 @@ struct trapframe { > register_t t5; > register_t t6; > register_t t7; > +#endif > register_t s0; > register_t s1; > register_t s2; > > Modified: head/sys/mips/mips/trap.c > ============================================================================== > --- head/sys/mips/mips/trap.c Tue Apr 23 06:37:50 2013 (r249789) > +++ head/sys/mips/mips/trap.c Tue Apr 23 09:38:18 2013 (r249790) > @@ -363,10 +363,10 @@ cpu_fetch_syscall_args(struct thread *td > /* > * Non-o32 ABIs support more arguments in registers. > */ > - sa->args[3] = locr0->t4; > - sa->args[4] = locr0->t5; > - sa->args[5] = locr0->t6; > - sa->args[6] = locr0->t7; > + sa->args[3] = locr0->t0; > + sa->args[4] = locr0->t1; > + sa->args[5] = locr0->t2; > + sa->args[6] = locr0->t3; > nsaved += 4; > #ifdef COMPAT_FREEBSD32 > } > @@ -389,10 +389,10 @@ cpu_fetch_syscall_args(struct thread *td > /* > * Non-o32 ABIs support more arguments in registers. > */ > - sa->args[4] = locr0->t4; > - sa->args[5] = locr0->t5; > - sa->args[6] = locr0->t6; > - sa->args[7] = locr0->t7; > + sa->args[4] = locr0->t0; > + sa->args[5] = locr0->t1; > + sa->args[6] = locr0->t2; > + sa->args[7] = locr0->t3; > nsaved += 4; > #ifdef COMPAT_FREEBSD32 > } These should use a4, a5, a6, a7 now, not t0, t1, t2, t3.