nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Preprocess assembly files with the C preprocessor.

This commit is contained in:
Jonas 'Sortie' Termansen 2013-12-28 21:00:15 +01:00
parent 8a49c47742
commit 6788f0096e
34 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/Makefile
View File

@ -188,8 +188,8 @@ endif
%.o: %.cpp %.o: %.cpp
$(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS) $(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS)
%.o: %.s %.o: %.S
$(HOSTAS) $< -o $@ $(ASFLAGS) $(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS)
clean: clean:
rm -f $(ALLOBJS) sortix.bin rm -f $(ALLOBJS) sortix.bin

2
kernel/x64/base.s → kernel/x64/base.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x64/base.s x64/base.S
Bootstraps the kernel and passes over control from the boot-loader to the Bootstraps the kernel and passes over control from the boot-loader to the
kernel main function. kernel main function.

2
kernel/x64/boot.s → kernel/x64/boot.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x64/boot.s x64/boot.S
Bootstraps the kernel and passes over control from the boot-loader to the Bootstraps the kernel and passes over control from the boot-loader to the
kernel main function. It also jumps into long mode! kernel main function. It also jumps into long mode!

2
kernel/x64/calltrace.s → kernel/x64/calltrace.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x64/calltrace.s x64/calltrace.S
Attempts to unwind the stack and prints the code locations where functions Attempts to unwind the stack and prints the code locations where functions
were called. This greatly aids debugging. were called. This greatly aids debugging.

2
kernel/x64/crti.s → kernel/x64/crti.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x64/crti.s x64/crti.S
Provides the header of the _init and _fini functions. Provides the header of the _init and _fini functions.
*******************************************************************************/ *******************************************************************************/

2
kernel/x64/crtn.s → kernel/x64/crtn.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x64/crtn.s x64/crtn.S
Provides the tail of the _init and _fini functions. Provides the tail of the _init and _fini functions.
*******************************************************************************/ *******************************************************************************/

2
kernel/x64/interrupt.s → kernel/x64/interrupt.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x64/interrupt.s x64/interrupt.S
Transfers control to interrupt handlers when interrupts happen. Transfers control to interrupt handlers when interrupts happen.
*******************************************************************************/ *******************************************************************************/

2
kernel/x64/kthread.s → kernel/x64/kthread.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x64/kthread.s x64/kthread.S
Utilities and synchronization mechanisms for x64 kernel threads. Utilities and synchronization mechanisms for x64 kernel threads.
*******************************************************************************/ *******************************************************************************/

2
kernel/x64/syscall.s → kernel/x64/syscall.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x64/syscall.s x64/syscall.S
An assembly stub that acts as glue for system calls. An assembly stub that acts as glue for system calls.
*******************************************************************************/ *******************************************************************************/

2
kernel/x86/base.s → kernel/x86/base.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x86/base.s x86/base.S
Bootstraps the kernel and passes over control from the boot-loader to the Bootstraps the kernel and passes over control from the boot-loader to the
kernel main function. kernel main function.

2
kernel/x86/boot.s → kernel/x86/boot.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x86/boot.s x86/boot.S
Bootstraps the kernel and passes over control from the boot-loader to the Bootstraps the kernel and passes over control from the boot-loader to the
kernel main function. kernel main function.

2
kernel/x86/calltrace.s → kernel/x86/calltrace.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x86/calltrace.s x86/calltrace.S
Attempts to unwind the stack and prints the code locations where functions Attempts to unwind the stack and prints the code locations where functions
were called. This greatly aids debugging. were called. This greatly aids debugging.

2
kernel/x86/crti.s → kernel/x86/crti.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x86/crti.s x86/crti.S
Provides the header of the _init and _fini functions. Provides the header of the _init and _fini functions.
*******************************************************************************/ *******************************************************************************/

2
kernel/x86/crtn.s → kernel/x86/crtn.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x86/crtn.s x86/crtn.S
Provides the tail of the _init and _fini functions. Provides the tail of the _init and _fini functions.
*******************************************************************************/ *******************************************************************************/

2
kernel/x86/interrupt.s → kernel/x86/interrupt.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x86/interrupt.s x86/interrupt.S
Transfers control to interrupt handlers when interrupts happen. Transfers control to interrupt handlers when interrupts happen.
*******************************************************************************/ *******************************************************************************/

2
kernel/x86/kthread.s → kernel/x86/kthread.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x86/kthread.s x86/kthread.S
Utilities and synchronization mechanisms for x86 kernel threads. Utilities and synchronization mechanisms for x86 kernel threads.
*******************************************************************************/ *******************************************************************************/

2
kernel/x86/syscall.s → kernel/x86/syscall.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>. Sortix. If not, see <http://www.gnu.org/licenses/>.
x86/syscall.s x86/syscall.S
An assembly stub that acts as glue for system calls. An assembly stub that acts as glue for system calls.
*******************************************************************************/ *******************************************************************************/

4
libc/Makefile
View File

@ -575,8 +575,8 @@ headers:
%.o: %.cpp %.o: %.cpp
$(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(FLAGS) $(CXXFLAGS) $(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(FLAGS) $(CXXFLAGS)
%.o: %.s %.o: %.S
$(HOSTAS) $(ASFLAGS) $< -o $@ $(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(FLAGS) $(CFLAGS)
# libc-sortix # libc-sortix
sortix/%.o: %.c sortix/%.o: %.c

2
libc/x64/calltrace.s → libc/x64/calltrace.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x64/calltrace.s x64/calltrace.S
Attempts to unwind the stack and prints the code locations where functions Attempts to unwind the stack and prints the code locations where functions
were called. This greatly aids debugging. were called. This greatly aids debugging.

2
libc/x64/crt1.s → libc/x64/crt1.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x64/crt1.s x64/crt1.S
Implement the _start symbol at which execution begins which performs the Implement the _start symbol at which execution begins which performs the
task of initializing the standard library and executing the main function. task of initializing the standard library and executing the main function.

2
libc/x64/crti.s → libc/x64/crti.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x64/crti.s x64/crti.S
Provides the header of the _init and _fini functions. Provides the header of the _init and _fini functions.
*******************************************************************************/ *******************************************************************************/

2
libc/x64/crtn.s → libc/x64/crtn.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x64/crtn.s x64/crtn.S
Provides the tail of the _init and _fini functions. Provides the tail of the _init and _fini functions.
*******************************************************************************/ *******************************************************************************/

2
libc/x64/fork.s → libc/x64/fork.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x64/fork.s x64/fork.S
Assembly functions related to forking x64 processes. Assembly functions related to forking x64 processes.
*******************************************************************************/ *******************************************************************************/

2
libc/x64/setjmp.s → libc/x64/setjmp.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x64/setjmp.s x64/setjmp.S
Implement the assembly part of setjmp. Implement the assembly part of setjmp.
*******************************************************************************/ *******************************************************************************/

2
libc/x64/signal.s → libc/x64/signal.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x64/signal.s x64/signal.S
An assembly stub that for handling unix signals. An assembly stub that for handling unix signals.
*******************************************************************************/ *******************************************************************************/

2
libc/x64/syscall.s → libc/x64/syscall.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x64/syscall.s x64/syscall.S
Function for performing system calls. Function for performing system calls.
*******************************************************************************/ *******************************************************************************/

2
libc/x86/calltrace.s → libc/x86/calltrace.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x86/calltrace.s x86/calltrace.S
Attempts to unwind the stack and prints the code locations where functions Attempts to unwind the stack and prints the code locations where functions
were called. This greatly aids debugging. were called. This greatly aids debugging.

2
libc/x86/crt1.s → libc/x86/crt1.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x86/crt1.s x86/crt1.S
Implement the _start symbol at which execution begins which performs the Implement the _start symbol at which execution begins which performs the
task of initializing the standard library and executing the main function. task of initializing the standard library and executing the main function.

2
libc/x86/crti.s → libc/x86/crti.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x86/crti.s x86/crti.S
Provides the header of the _init and _fini functions. Provides the header of the _init and _fini functions.
*******************************************************************************/ *******************************************************************************/

2
libc/x86/crtn.s → libc/x86/crtn.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x86/crtn.s x86/crtn.S
Provides the tail of the _init and _fini functions. Provides the tail of the _init and _fini functions.
*******************************************************************************/ *******************************************************************************/

2
libc/x86/fork.s → libc/x86/fork.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x86/fork.s x86/fork.S
Assembly functions related to forking x86 processes. Assembly functions related to forking x86 processes.
*******************************************************************************/ *******************************************************************************/

2
libc/x86/setjmp.s → libc/x86/setjmp.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x86/setjmp.s x86/setjmp.S
Implement the assembly part of setjmp. Implement the assembly part of setjmp.
*******************************************************************************/ *******************************************************************************/

2
libc/x86/signal.s → libc/x86/signal.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x86/signal.s x86/signal.S
An assembly stub that for handling unix signals. An assembly stub that for handling unix signals.
*******************************************************************************/ *******************************************************************************/

2
libc/x86/syscall.s → libc/x86/syscall.S
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>. along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
x86/syscall.s x86/syscall.S
Function for performing system calls. Function for performing system calls.
*******************************************************************************/ *******************************************************************************/