Add lock stubs for m68k. Amiga builds and runs now.
This commit is contained in:
mhitch
parent
9d17b3cb4d
commit
5271afeb9d
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files.m68k,v 1.37 2005/12/11 12:17:52 christos Exp $
|
||||
# $NetBSD: files.m68k,v 1.38 2007/02/15 02:48:48 mhitch Exp $
|
||||
#
|
||||
|
||||
defflag opt_fpsp.h FPSP
|
||||
|
|
@ -14,6 +14,7 @@ file arch/m68k/m68k/db_trace.c ddb
|
|||
file arch/m68k/m68k/in_cksum.c inet
|
||||
file netinet/in4_cksum.c inet
|
||||
file arch/m68k/m68k/kgdb_m68k.c kgdb
|
||||
file arch/m68k/m68k/lock_stubs.s
|
||||
file arch/m68k/m68k/m68k_machdep.c
|
||||
file arch/m68k/m68k/mappedcopy.c mappedcopy
|
||||
file netns/ns_cksum.c ns
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mutex.h,v 1.2 2007/02/09 21:55:05 ad Exp $ */
|
||||
/* $NetBSD: mutex.h,v 1.3 2007/02/15 02:48:48 mhitch Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
|
||||
|
|
@ -58,6 +58,7 @@ struct kmutex {
|
|||
};
|
||||
|
||||
#define __HAVE_SIMPLE_MUTEXES 1
|
||||
#define __HAVE_MUTEX_STUBS 1
|
||||
|
||||
#define MUTEX_RECEIVE(mtx) mb_read()
|
||||
#define MUTEX_GIVE(mtx) mb_memory()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,97 @@
|
|||
/* $NetBSD: lock_stubs.s,v 1.1 2007/02/15 02:48:48 mhitch Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2007 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Andrew Doran and Michael Hitch.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the NetBSD
|
||||
* Foundation, Inc. and its contributors.
|
||||
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
||||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "opt_lockdebug.h"
|
||||
|
||||
#include <machine/asm.h>
|
||||
|
||||
#include "assym.h"
|
||||
|
||||
#if defined(DIAGNOSTIC)
|
||||
#define FULL
|
||||
#endif
|
||||
|
||||
.file "lock_stubs.s"
|
||||
.text
|
||||
|
||||
#ifndef __mc68010__
|
||||
/*
|
||||
* int _lock_cas(uintptr_t *val, uintptr_t old, uintptr_t new);
|
||||
*/
|
||||
ENTRY(_lock_cas)
|
||||
movl %sp@(4),%a0 | a0 = val address
|
||||
movl %sp@(8),%d0 | d0 = old value
|
||||
movl %sp@(12),%d1 | d1 = new value
|
||||
casl %d0,%d1,%a0@ | compare old, set new
|
||||
beqb 1f | matched and set
|
||||
movq #0,%d0
|
||||
rts
|
||||
1: movq #1,%d0
|
||||
rts
|
||||
|
||||
#if !defined(LOCKDEBUG)
|
||||
|
||||
/*
|
||||
* void mutex_enter(kmutex_t *mtx);
|
||||
*/
|
||||
ENTRY(mutex_enter)
|
||||
movq #0,%d0
|
||||
movl _C_LABEL(curlwp),%d1
|
||||
movl %sp@(4),%a0
|
||||
casl %d0,%d1,%a0@
|
||||
bnes 1f
|
||||
rts
|
||||
1: jra _C_LABEL(mutex_vector_enter)
|
||||
|
||||
/*
|
||||
* void mutex_exit(kmutex_t *mtx);
|
||||
*/
|
||||
ENTRY(mutex_exit)
|
||||
movl _C_LABEL(curlwp),%d0
|
||||
movq #0,%d1
|
||||
movl %sp@(4),%a0
|
||||
casl %d0,%d1,%a0@
|
||||
bnes 1f
|
||||
rts
|
||||
1: jra _C_LABEL(mutex_vector_exit)
|
||||
|
||||
|
||||
#endif /* !LOCKDEBUG */
|
||||
#else /* __mc68010__ */
|
||||
#error no locking stubs for 68010 yet
|
||||
#endif /* __mc68010__ */
|
||||
Loading…
Reference in New Issue