From owner-p4-projects@FreeBSD.ORG Sat May 12 08:49:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1134D16A408; Sat, 12 May 2007 08:49:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A195C16A403 for ; Sat, 12 May 2007 08:49:39 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 90C4313C45D for ; Sat, 12 May 2007 08:49:39 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4C8nd6m079881 for ; Sat, 12 May 2007 08:49:39 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4C8ndlC079878 for perforce@freebsd.org; Sat, 12 May 2007 08:49:39 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 12 May 2007 08:49:39 GMT Message-Id: <200705120849.l4C8ndlC079878@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 119718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 May 2007 08:49:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=119718 Change 119718 by rdivacky@rdivacky_witten on 2007/05/12 08:49:14 Linux32_support.s WIP. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_support.s#3 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_support.s#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1993 The Regents of the University of California. + * Copyright (c) 2007 The FreeBSD Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,8 +29,8 @@ * $FreeBSD$ */ -#include "linux32_assym.h" /* system definitions */ -#include /* miscellaneous asm macros */ +#include "linux32_assym.h" /* system definitions */ +#include /* miscellaneous asm macros */ #include "assym.s" @@ -39,96 +39,87 @@ /*****************************************************************************/ futex_fault: - movq $0,PCB_ONFAULT(%rcx) - movq $-EFAULT,%rax + movq $0,PCB_ONFAULT(%r8) + movl $-EFAULT,%eax ret ENTRY(futex_xchgl) - movq PCPU(CURPCB),%rcx - movq $futex_fault,PCB_ONFAULT(%rcx) - + movq PCPU(CURPCB),%r8 + movq $futex_fault,PCB_ONFAULT(%r8) movq $VM_MAXUSER_ADDRESS-4,%rax cmpq %rax,%rsi ja futex_fault - - movl (%rsi),%eax - movl %eax,(%rdx) -#ifdef SMP - lock -#endif xchgl %edi,(%rsi) + movl %edi,(%rdx) xorl %eax,%eax - movq %rax,PCB_ONFAULT(%rcx) + movq %rax,PCB_ONFAULT(%r8) ret ENTRY(futex_addl) - movq PCPU(CURPCB),%rcx - movq $futex_fault,PCB_ONFAULT(%rcx) - + movq PCPU(CURPCB),%r8 + movq $futex_fault,PCB_ONFAULT(%r8) movq $VM_MAXUSER_ADDRESS-4,%rax cmpq %rax,%rsi ja futex_fault - - movl (%rsi),%eax - movl %eax,(%rdx) #ifdef SMP lock #endif xaddl %edi,(%rsi) + movl %edi,(%rdx) xorl %eax,%eax - movq %rax,PCB_ONFAULT(%rcx) + movq %rax,PCB_ONFAULT(%r8) ret ENTRY(futex_orl) - movq PCPU(CURPCB),%rcx - movq $futex_fault,PCB_ONFAULT(%rcx) - + movq PCPU(CURPCB),%r8 + movq $futex_fault,PCB_ONFAULT(%r8) movq $VM_MAXUSER_ADDRESS-4,%rax cmpq %rax,%rsi ja futex_fault - movl (%rsi),%eax - movl %eax,(%rdx) +1: movl %eax,%ecx + orl %edi,%ecx #ifdef SMP lock #endif - orl %edi,(%rsi) + cmpxchgl %ecx,(%rsi) + jnz 1b xorl %eax,%eax - movq %rax,PCB_ONFAULT(%rcx) + movq %rax,PCB_ONFAULT(%r8) ret ENTRY(futex_andl) - movq PCPU(CURPCB),%rcx - movq $futex_fault,PCB_ONFAULT(%rcx) - + movq PCPU(CURPCB),%r8 + movq $futex_fault,PCB_ONFAULT(%r8) movq $VM_MAXUSER_ADDRESS-4,%rax cmpq %rax,%rsi ja futex_fault - movl (%rsi),%eax - movl %eax,(%rdx) +1: movl %eax,%ecx + andl %edi,%ecx #ifdef SMP lock #endif - andl %edi,(%rsi) + cmpxchgl %ecx,(%rsi) + jnz 1b xorl %eax,%eax - movq %rax,PCB_ONFAULT(%rcx) + movq %rax,PCB_ONFAULT(%r8) ret ENTRY(futex_xorl) - movq PCPU(CURPCB),%rcx - movq $futex_fault,PCB_ONFAULT(%rcx) - + movq PCPU(CURPCB),%r8 + movq $futex_fault,PCB_ONFAULT(%r8) movq $VM_MAXUSER_ADDRESS-4,%rax cmpq %rax,%rsi ja futex_fault - movl (%rsi),%eax - movl %eax,(%rdx) +1: movl %eax,%ecx + xorl %edi,%ecx #ifdef SMP lock #endif - xorl %edi,(%rsi) + cmpxchgl %ecx,(%rsi) + jnz 1b xorl %eax,%eax - movq %rax,PCB_ONFAULT(%rcx) + movq %rax,PCB_ONFAULT(%r8) ret