Skip to content

Commit 898aac7

Browse files
committed
Merge pull request SamyPesse#15 from 0x1A/master
Various typo fixes
2 parents 6730970 + 9e340f8 commit 898aac7

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Chapter-4/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ The compiler will assume that all the C++ runtime support is available by defaul
88

99
Our basic C++ runtime can be found in the [cxx.cc](https://github.com/SamyPesse/How-to-Make-a-Computer-Operating-System/blob/master/src/kernel/runtime/cxx.cc) file.
1010

11-
**Caution:** The operators *new* and *delete* cannot be used before virtual memory and pagination have been initialized.
11+
**Caution:** The operators `new` and `delete` cannot be used before virtual memory and pagination have been initialized.
1212

1313
#### Basic C/C++ functions
1414

15-
The kernel code can't use functions from the standards libraries so we need to add some basics functions for managing memory, string, ...
15+
The kernel code can't use functions from the standard libraries so we need to add some basic functions for managing memory and strings:
1616

1717
```
1818
void itoa(char *buf, unsigned long int n, int base);
@@ -32,7 +32,7 @@ These functions are defined in [string.cc](https://github.com/SamyPesse/How-to-M
3232

3333
#### Compile our kernel
3434

35-
Compiling a kernel is not the same thing as compile a linux executable, we can't use standard library and need no dependencies to the system.
35+
Compiling a kernel is not the same thing as compiling a linux executable, we can't use a standard library and should have no dependencies to the system.
3636

3737
Our [Makefile](https://github.com/SamyPesse/How-to-Make-a-Computer-Operating-System/blob/master/src/kernel/Makefile) will define the process to compile and link our kernel.
3838

@@ -48,7 +48,7 @@ SC=g++
4848
FLAG= $(INCDIR) -g -O2 -w -trigraphs -fno-builtin -fno-exceptions -fno-stack-protector -O0 -m32 -fno-rtti -nostdlib -nodefaultlibs
4949
5050
# Assembly compiler
51-
ASM=nasm
51+
ASM=nasm
5252
ASMFLAG=-f elf -o
5353
```
5454

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
How to Make a Computer Operating System
22
=======================================
33

4-
**Caution**: This repository is a remake of my old course. It was written several years ago [as one of my first projects when I was in High School](https://github.com/SamyPesse/devos) so it's normal if some parts of the code looks like "crap". The original course was in French and I'm not an English native. I'm going to continue and improve this course in my free-time.
4+
**Caution**: This repository is a remake of my old course. It was written several years ago [as one of my first projects when I was in High School](https://github.com/SamyPesse/devos) so it's normal if some parts of the code look like "crap". The original course was in French and I'm not an English native. I'm going to continue and improve this course in my free-time.
55

6-
**Source Code**: All the system source code will be stored in the `src` directory. Each steps will contains links to the differents related files.
6+
**Source Code**: All the system source code will be stored in the `src` directory. Each step will contain links to the different related files.
77

88
**Contributions**: This course is open to contributions, feel free to signal errors with issues or directly correct the errors with pull-requests.
99

10-
**Questions**: Feel free to ask the questions by adding issues and please don't email me.
10+
**Questions**: Feel free to ask any questions by adding issues. Please don't email me.
1111

1212
You can follow me on Twitter [@SamyPesse](https://twitter.com/SamyPesse) or support me on [Flattr](https://flattr.com/profile/samy.pesse) or [Gittip](https://www.gittip.com/SamyPesse/).
1313

1414
### What kind of OS are we building?
1515

16-
The goal is to build a very simple UNIX-based operating system in C++, but the goal is not to just build a "proof-of-concept". The OS should be able to boot, start an userland shell and be extensible.
16+
The goal is to build a very simple UNIX-based operating system in C++, not just a "proof-of-concept". The OS should be able to boot, start an userland shell and be extensible.
1717

1818
[![Screen](https://raw.github.com/SamyPesse/How-to-Make-a-Computer-Operating-System/master/preview.png)](https://raw.github.com/SamyPesse/How-to-Make-a-Computer-Operating-System/master/preview.png)
1919

0 commit comments

Comments
 (0)