Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

more stuff

  • Loading branch information...
commit 7857c94d7ba6918c20911580645f734c0f623234 1 parent 10a2cfc
@comex authored
View
2  bsd/i386/setjmp.h
@@ -56,7 +56,7 @@ typedef int sigjmp_buf[_JBLEN + 1];
* onstack, mask = 2 ints
*/
-#if defined(KERNEL)
+#if 0 //defined(KERNEL)
#define __need_struct_sigcontext
#include <i386/_structs.h>
View
2  bsd/sys/mount_internal.h
@@ -116,8 +116,10 @@ struct mount {
uint32_t mnt_flag; /* flags */
uint32_t mnt_kern_flag; /* kernel only flags */
uint32_t mnt_lflag; /* mount life cycle flags */
+ uint32_t mnt_compound_ops;
uint32_t mnt_maxsymlinklen; /* max size of short symlink */
struct vfsstatfs mnt_vfsstat; /* cache of filesystem stats */
+ // the rest of this struct is wrong too
qaddr_t mnt_data; /* private data */
/* Cached values of the IO constraints for the device */
uint32_t mnt_maxreadcnt; /* Max. byte count for read */
View
2  bsd/vfs/vfs_fsevents.c
@@ -1990,7 +1990,7 @@ fseventsf_ioctl(struct fileproc *fp, u_long cmd, caddr_t data, vfs_context_t ctx
break;
}
- case OLD_FSEVENTS_DEVICE_FILTER:
+ //case OLD_FSEVENTS_DEVICE_FILTER:
case NEW_FSEVENTS_DEVICE_FILTER: {
int new_num_devices;
dev_t *devices_not_to_watch, *tmp=NULL;
View
51 libkern/i386/OSAtomic.s
@@ -35,14 +35,7 @@
_OSCompareAndSwap:
_OSCompareAndSwapPtr:
- movl 4(%esp), %eax #; oldValue
- movl 8(%esp), %edx #; newValue
- movl 12(%esp), %ecx #; ptr
- lock
- cmpxchgl %edx, 0(%ecx) #; CAS (eax is an implicit operand)
- sete %al #; did CAS succeed? (TZ=1)
- movzbl %al, %eax #; clear out the high bytes
- ret
+ bx lr
#;*****************************************************************************
#;* Boolean OSCompareAndSwap64(SInt64 oldValue, SInt64 newValue, SInt64 *ptr) *
@@ -51,22 +44,7 @@ _OSCompareAndSwapPtr:
.globl _OSCompareAndSwap64
_OSCompareAndSwap64:
- pushl %edi
- pushl %ebx
-
- movl 4+8(%esp), %eax #; low 32-bits of oldValue
- movl 8+8(%esp), %edx #; high 32-bits of oldValue
- movl 12+8(%esp), %ebx #; low 32-bits of newValue
- movl 16+8(%esp), %ecx #; high 32-bits of newValue
- movl 20+8(%esp), %edi #; ptr
- lock
- cmpxchg8b 0(%edi) #; CAS (eax:edx, ebx:ecx implicit)
- sete %al #; did CAS succeed? (TZ=1)
- movzbl %al, %eax #; clear out the high bytes
-
- popl %ebx
- popl %edi
- ret
+ bx lr
#;*******************************************************
#;* SInt64 OSAddAtomic64(SInt64 theAmount, SInt64 *ptr) *
@@ -74,24 +52,7 @@ _OSCompareAndSwap64:
.globl _OSAddAtomic64
_OSAddAtomic64:
- pushl %edi
- pushl %ebx
-
- movl 12+8(%esp), %edi #; ptr
- movl 0(%edi), %eax #; load low 32-bits of *ptr
- movl 4(%edi), %edx #; load high 32-bits of *ptr
-1:
- movl %eax, %ebx
- movl %edx, %ecx #; ebx:ecx := *ptr
- addl 4+8(%esp), %ebx
- adcl 8+8(%esp), %ecx #; ebx:ecx := *ptr + theAmount
- lock
- cmpxchg8b 0(%edi) #; CAS (eax:edx, ebx:ecx implicit)
- jnz 1b #; - failure: eax:edx re-loaded, retry
- #; - success: old value in eax:edx
- popl %ebx
- popl %edi
- ret
+ bx lr
#;*******************************************************
#; SInt32 OSAddAtomic(SInt32 delta, SInt32 *address)
@@ -101,8 +62,4 @@ _OSAddAtomic64:
.globl _OSAddAtomicLong
_OSAddAtomic:
_OSAddAtomicLong:
- movl 4(%esp), %eax #; Load addend
- movl 8(%esp), %ecx #; Load address of operand
- lock
- xaddl %eax, 0(%ecx) #; Atomic exchange and add
- ret
+ bx lr
View
2  libsa/bootstrap.cpp
@@ -237,7 +237,7 @@ KLDBootstrap::readPrelinkedExtensions(
void * prelinkData = NULL; // see code
void * prelinkCopy = NULL; // see code
vm_size_t prelinkLength = 0;
-#if !__LP64__ && !defined(__arm__)
+#if !__LP64__// && !defined(__arm__)
vm_map_offset_t prelinkDataMapOffset = 0;
#endif
View
2  makedefs/MakeInc.dir
@@ -126,7 +126,7 @@ build_installhdrs_md: $(BUILD_INSTALLHDRS_MD_SUBDIRS_TARGETS)
#
# Install kernel header files
#
-exporthdrs: exporthdrs_mi exporthdrs_md
+exporthdrs: # exporthdrs_mi exporthdrs_md
#
# Install header files order
View
3  osfmk/i386/bsd_i386.c
@@ -72,7 +72,7 @@
#ifdef MACH_BSD
extern void mach_kauth_cred_uthread_update(void);
#endif
-
+/*
kern_return_t
thread_userstack(
thread_t,
@@ -91,6 +91,7 @@ thread_entrypoint(
unsigned int,
mach_vm_offset_t *
);
+*/
void * find_user_regs(thread_t);
View
16 osfmk/i386/machine_routines_asm.s
@@ -63,22 +63,6 @@ LEXT(_rtc_nanotime_store)
.align FALIGN
LEXT(_rtc_nanotime_adjust)
- mov 12(%esp),%edx /* ptr to rtc_nanotime_info */
-
- movl RNT_GENERATION(%edx),%ecx /* get current generation */
- movl $0,RNT_GENERATION(%edx) /* flag data as being updated */
-
- movl 4(%esp),%eax /* get lower 32-bits of delta */
- addl %eax,RNT_TSC_BASE(%edx)
- adcl $0,RNT_TSC_BASE+4(%edx) /* propagate carry */
-
- incl %ecx /* next generation */
- jnz 1f
- incl %ecx /* skip 0, which is a flag */
-1: movl %ecx,RNT_GENERATION(%edx) /* update generation and make usable */
-
- ret
-
/* unint64_t _rtc_nanotime_read( rtc_nanotime_t *rntp, int slow );
*
View
4 osfmk/kern/locks.h
@@ -286,12 +286,8 @@ extern void lck_mtx_init(
extern void lck_mtx_lock(
lck_mtx_t *lck);
-#if defined(__i386__)
-extern void lck_mtx_unlock(lck_mtx_t *lck) __DARWIN10_ALIAS(lck_mtx_unlock);
-#else
extern void lck_mtx_unlock(
lck_mtx_t *lck);
-#endif /* __i386__ */
extern void lck_mtx_destroy(
lck_mtx_t *lck,
lck_grp_t *grp);
Please sign in to comment.
Something went wrong with that request. Please try again.