76c76
< //This argument register is r10 for syscalls and rcx for C.
---
> // This argument register is r10 for syscalls and rcx for C.
78c78
< //INTREG_RCX,
---
> // INTREG_RCX,
186c186
< // Set up the vsyscall page for this process.
---
> // Set up the vsyscall page for this process.
569c569
< //Initialize the segment registers.
---
> // Initialize the segment registers.
601c601
< //Set up the registers that describe the operating mode.
---
> // Set up the registers that describe the operating mode.
680c680
< //Initialize the segment registers.
---
> // Initialize the segment registers.
721c721
< //Set up the registers that describe the operating mode.
---
> // Set up the registers that describe the operating mode.
758c758
< //We want 16 byte alignment
---
> // We want 16 byte alignment
844,845c844,845
< //Bits which describe the system hardware capabilities
< //XXX Figure out what these should be
---
> // Bits which describe the system hardware capabilities
> // XXX Figure out what these should be
847c847
< //The system page size
---
> // The system page size
849,850c849,850
< //Frequency at which times() increments
< //Defined to be 100 in the kernel source.
---
> // Frequency at which times() increments
> // Defined to be 100 in the kernel source.
863c863
< //XXX Figure out what this should be.
---
> // XXX Figure out what this should be.
865c865
< //The entry point to the program
---
> // The entry point to the program
867c867
< //Different user and group IDs
---
> // Different user and group IDs
872c872
< //Whether to enable "secure mode" in the executable
---
> // Whether to enable "secure mode" in the executable
874c874
< //The address of 16 "random" bytes.
---
> // The address of 16 "random" bytes.
876c876
< //The name of the program
---
> // The name of the program
878c878
< //The platform string
---
> // The platform string
882c882
< //Figure out how big the initial stack needs to be
---
> // Figure out how big the initial stack needs to be
887,888c887,888
< //This is the name of the file which is present on the initial stack
< //It's purpose is to let the user space linker examine the original file.
---
> // This is the name of the file which is present on the initial stack
> // It's purpose is to let the user space linker examine the original file.
904,907c904,907
< //The info_block needs to be padded so it's size is a multiple of the
< //alignment mask. Also, it appears that there needs to be at least some
< //padding, so if the size is already a multiple, we need to increase it
< //anyway.
---
> // The info_block needs to be padded so its size is a multiple of the
> // alignment mask. Also, it appears that there needs to be at least some
> // padding, so if the size is already a multiple, we need to increase it
> // anyway.
915c915
< //Each auxilliary vector is two 8 byte words
---
> // Each auxiliary vector is two 8 byte words
923c923
< //Figure out the size of the contents of the actual initial frame
---
> // Figure out the size of the contents of the actual initial frame
930,931c930,931
< //There needs to be padding after the auxiliary vector data so that the
< //very bottom of the stack is aligned properly.
---
> // There needs to be padding after the auxiliary vector data so that the
> // very bottom of the stack is aligned properly.
985c985
< //Write out the sentry void *
---
> // Write out the sentry void *
987,988c987
< initVirtMem.writeBlob(sentry_base,
< (uint8_t*)&sentry_NULL, sentry_size);
---
> initVirtMem.writeBlob(sentry_base, (uint8_t*)&sentry_NULL, sentry_size);
990c989
< //Write the file name
---
> // Write the file name
993c992
< //Fix up the aux vectors which point to data
---
> // Fix up the aux vectors which point to data
1001c1000,1001
< //Copy the aux stuff
---
>
> // Copy the aux stuff
1008c1008
< //Write out the terminating zeroed auxilliary vector
---
> // Write out the terminating zeroed auxiliary vector
1023c1023
< //Set the stack pointer register
---
> // Set the stack pointer register
1030c1030
< //Align the "stack_min" to a page boundary.
---
> // Align the "stack_min" to a page boundary.
< //This argument register is r10 for syscalls and rcx for C.
---
> // This argument register is r10 for syscalls and rcx for C.
78c78
< //INTREG_RCX,
---
> // INTREG_RCX,
186c186
< // Set up the vsyscall page for this process.
---
> // Set up the vsyscall page for this process.
569c569
< //Initialize the segment registers.
---
> // Initialize the segment registers.
601c601
< //Set up the registers that describe the operating mode.
---
> // Set up the registers that describe the operating mode.
680c680
< //Initialize the segment registers.
---
> // Initialize the segment registers.
721c721
< //Set up the registers that describe the operating mode.
---
> // Set up the registers that describe the operating mode.
758c758
< //We want 16 byte alignment
---
> // We want 16 byte alignment
844,845c844,845
< //Bits which describe the system hardware capabilities
< //XXX Figure out what these should be
---
> // Bits which describe the system hardware capabilities
> // XXX Figure out what these should be
847c847
< //The system page size
---
> // The system page size
849,850c849,850
< //Frequency at which times() increments
< //Defined to be 100 in the kernel source.
---
> // Frequency at which times() increments
> // Defined to be 100 in the kernel source.
863c863
< //XXX Figure out what this should be.
---
> // XXX Figure out what this should be.
865c865
< //The entry point to the program
---
> // The entry point to the program
867c867
< //Different user and group IDs
---
> // Different user and group IDs
872c872
< //Whether to enable "secure mode" in the executable
---
> // Whether to enable "secure mode" in the executable
874c874
< //The address of 16 "random" bytes.
---
> // The address of 16 "random" bytes.
876c876
< //The name of the program
---
> // The name of the program
878c878
< //The platform string
---
> // The platform string
882c882
< //Figure out how big the initial stack needs to be
---
> // Figure out how big the initial stack needs to be
887,888c887,888
< //This is the name of the file which is present on the initial stack
< //It's purpose is to let the user space linker examine the original file.
---
> // This is the name of the file which is present on the initial stack
> // It's purpose is to let the user space linker examine the original file.
904,907c904,907
< //The info_block needs to be padded so it's size is a multiple of the
< //alignment mask. Also, it appears that there needs to be at least some
< //padding, so if the size is already a multiple, we need to increase it
< //anyway.
---
> // The info_block needs to be padded so its size is a multiple of the
> // alignment mask. Also, it appears that there needs to be at least some
> // padding, so if the size is already a multiple, we need to increase it
> // anyway.
915c915
< //Each auxilliary vector is two 8 byte words
---
> // Each auxiliary vector is two 8 byte words
923c923
< //Figure out the size of the contents of the actual initial frame
---
> // Figure out the size of the contents of the actual initial frame
930,931c930,931
< //There needs to be padding after the auxiliary vector data so that the
< //very bottom of the stack is aligned properly.
---
> // There needs to be padding after the auxiliary vector data so that the
> // very bottom of the stack is aligned properly.
985c985
< //Write out the sentry void *
---
> // Write out the sentry void *
987,988c987
< initVirtMem.writeBlob(sentry_base,
< (uint8_t*)&sentry_NULL, sentry_size);
---
> initVirtMem.writeBlob(sentry_base, (uint8_t*)&sentry_NULL, sentry_size);
990c989
< //Write the file name
---
> // Write the file name
993c992
< //Fix up the aux vectors which point to data
---
> // Fix up the aux vectors which point to data
1001c1000,1001
< //Copy the aux stuff
---
>
> // Copy the aux stuff
1008c1008
< //Write out the terminating zeroed auxilliary vector
---
> // Write out the terminating zeroed auxiliary vector
1023c1023
< //Set the stack pointer register
---
> // Set the stack pointer register
1030c1030
< //Align the "stack_min" to a page boundary.
---
> // Align the "stack_min" to a page boundary.