From owner-svn-src-projects@FreeBSD.ORG Sun Jul 6 16:42:04 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BF438E2F; Sun, 6 Jul 2014 16:42:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AC4D72088; Sun, 6 Jul 2014 16:42:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s66Gg4jk093551; Sun, 6 Jul 2014 16:42:04 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s66Gg4BM093547; Sun, 6 Jul 2014 16:42:04 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201407061642.s66Gg4BM093547@svn.freebsd.org> From: Andrew Turner Date: Sun, 6 Jul 2014 16:42:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r268322 - projects/arm64/sys/arm64/arm64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2014 16:42:04 -0000 Author: andrew Date: Sun Jul 6 16:42:04 2014 New Revision: 268322 URL: http://svnweb.freebsd.org/changeset/base/268322 Log: Move cpu_throw and cpu_switch to swtch.S. Modified: projects/arm64/sys/arm64/arm64/machdep.c projects/arm64/sys/arm64/arm64/swtch.S Modified: projects/arm64/sys/arm64/arm64/machdep.c ============================================================================== --- projects/arm64/sys/arm64/arm64/machdep.c Sun Jul 6 16:20:37 2014 (r268321) +++ projects/arm64/sys/arm64/arm64/machdep.c Sun Jul 6 16:42:04 2014 (r268322) @@ -209,19 +209,6 @@ cpu_pcpu_init(struct pcpu *pcpu, int cpu { } -/* TODO: Move to swtch.S and implemenet */ -void cpu_throw(struct thread *old, struct thread *new) -{ - - panic("cpu_throw"); -} - -void cpu_switch(struct thread *old, struct thread *new, struct mtx *mtx) -{ - - panic("cpu_switch"); -} - void spinlock_enter(void) { Modified: projects/arm64/sys/arm64/arm64/swtch.S ============================================================================== --- projects/arm64/sys/arm64/arm64/swtch.S Sun Jul 6 16:20:37 2014 (r268321) +++ projects/arm64/sys/arm64/arm64/swtch.S Sun Jul 6 16:42:04 2014 (r268322) @@ -25,10 +25,34 @@ * */ +#include "assym.s" + #include __FBSDID("$FreeBSD$"); +/* + * void cpu_throw(struct thread *old, struct thread *new) + */ +ENTRY(cpu_throw) + adr x0, .Lcpu_throw_panic_str + bl _C_LABEL(panic) + ret +.Lcpu_throw_panic_str: + .asciz "cpu_throw\0\0" +END(cpu_throw) + +/* + * void cpu_switch(struct thread *old, struct thread *new, struct mtx *mtx) + */ +ENTRY(cpu_switch) + adr x0, .Lcpu_switch_panic_str + bl _C_LABEL(panic) + ret +.Lcpu_switch_panic_str: + .asciz "cpu_switch\0" +END(cpu_throw) + ENTRY(savectx) adr x0, .Lsavectx_panic_str bl panic