/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
- *
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
*
* The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* Please see the License for the specific language governing rights and
* limitations under the License.
*
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/*
* @OSF_COPYRIGHT@
{ 1, 0, 1 }, /* code, readable, conforming */
};
-extern struct fake_descriptor ldt[]; /* for system call gate */
-
#if 0
/* Forward */
struct user_ldt *ldt;
int access;
- ldt = thread->top_act->mact.pcb->ims.ldt;
+ ldt = thread->machine.pcb->ims.ldt;
if (ldt == 0) {
switch (type) {
case S_CODE:
kern_return_t
i386_set_ldt(
- thread_act_t thr_act,
+ thread_t thr_act,
int first_selector,
descriptor_list_t desc_list,
mach_msg_type_number_t count)
return KERN_INVALID_ARGUMENT;
if (first_desc + count >= 8192)
return KERN_INVALID_ARGUMENT;
- if (thr_act == THR_ACT_NULL)
+ if (thr_act == THREAD_NULL)
return KERN_INVALID_ARGUMENT;
if ((thread = act_lock_thread(thr_act)) == THREAD_NULL) {
act_unlock_thread(thr_act);
*/
{
kern_return_t kr;
- vm_offset_t dst_addr;
+ vm_map_offset_t dst_addr;
old_copy_object = (vm_map_copy_t) desc_list;
return kr;
(void) vm_map_wire(ipc_kernel_map,
- trunc_page(dst_addr),
- round_page(dst_addr +
+ vm_map_trunc_page(dst_addr),
+ vm_map_round_page(dst_addr +
count * sizeof(struct real_descriptor)),
VM_PROT_READ|VM_PROT_WRITE, FALSE);
- desc_list = (descriptor_list_t) dst_addr;
+ desc_list = CAST_DOWN(descriptor_list_t, dst_addr);
}
for (i = 0, dp = (struct real_descriptor *) desc_list;
break;
default:
(void) vm_map_remove(ipc_kernel_map,
- (vm_offset_t) desc_list,
- count * sizeof(struct real_descriptor),
+ vm_map_trunc_page(desc_list),
+ vm_map_round_page(&desc_list[count]),
VM_MAP_REMOVE_KUNWIRE);
return KERN_INVALID_ARGUMENT;
}
ldt_size_needed = sizeof(struct real_descriptor)
* (first_desc + count);
- pcb = thr_act->mact.pcb;
+ pcb = thr_act->machine.pcb;
new_ldt = 0;
Retry:
simple_lock(&pcb->lock);
(char *)&new_ldt->ldt[0],
old_ldt->desc.limit_low + 1);
}
- else if (thr_act == current_act()) {
+ else if (thr_act == current_thread()) {
struct real_descriptor template = {0, 0, 0, ACC_P, 0, 0 ,0};
for (dp = &new_ldt->ldt[0], i = 0; i < first_desc; i++, dp++) {
/*
* Free the descriptor list.
*/
- (void) vm_map_remove(ipc_kernel_map, (vm_offset_t) desc_list,
- count * sizeof(struct real_descriptor),
- VM_MAP_REMOVE_KUNWIRE);
+ (void) vm_map_remove(ipc_kernel_map, vm_map_trunc_page(desc_list),
+ vm_map_round_page(&desc_list[count]),
+ VM_MAP_REMOVE_KUNWIRE);
return KERN_SUCCESS;
}
kern_return_t
i386_get_ldt(
- thread_act_t thr_act,
+ thread_t thr_act,
int first_selector,
int selector_count, /* number wanted */
descriptor_list_t *desc_list, /* in/out */
mach_msg_type_number_t *count) /* in/out */
{
struct user_ldt *user_ldt;
- pcb_t pcb = thr_act->mact.pcb;
+ pcb_t pcb = thr_act->machine.pcb;
int first_desc = sel_idx(first_selector);
unsigned int ldt_count;
vm_size_t ldt_size;
vm_offset_t addr;
thread_t thread;
- if (thr_act == THR_ACT_NULL || (thread = thr_act->thread)==THREAD_NULL)
+ if (thr_act == THREAD_NULL)
return KERN_INVALID_ARGUMENT;
if (first_desc < 0 || first_desc > 8191)
/*
* Unwire the memory and make it into copyin form.
*/
- (void) vm_map_unwire(ipc_kernel_map, trunc_page(addr),
- round_page(addr + size_used), FALSE);
- (void) vm_map_copyin(ipc_kernel_map, addr, size_used,
- TRUE, &memory);
+ (void) vm_map_unwire(ipc_kernel_map, vm_map_trunc_page(addr),
+ vm_map_round_page(addr + size_used), FALSE);
+ (void) vm_map_copyin(ipc_kernel_map, (vm_map_address_t)addr,
+ (vm_map_size_t)size_used, TRUE, &memory);
*desc_list = (descriptor_list_t) memory;
}
user_ldt_free(
user_ldt_t user_ldt)
{
- kfree((vm_offset_t)user_ldt,
+ kfree(user_ldt,
user_ldt->desc.limit_low+1+sizeof(struct real_descriptor));
}
projects / apple / xnu.git / blobdiff