From d67adbc8b1e9b8179e3d58b3d8939bed9cd83291 Mon Sep 17 00:00:00 2001 From: lux Date: Wed, 4 Oct 2017 23:59:35 +0200 Subject: [PATCH] Change the program name and rework spelling --- .gitignore | 2 +- README.md | 8 ++++---- makefile | 2 +- src/toy.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 57bd562..5262bcc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ *.o /*.toy /coredump* -toy_cpu +toy-CPU diff --git a/README.md b/README.md index 44fea0d..59383a7 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ The project can be built by using `make`. ## Usage -Pass the RAM content to the machine via a text file.
+Transfer the RAM content to the machine via a text file.
The program call is: `toy_cpu` SOURCE.toy
The following is the specification for a 16 BIT machine word. With it, you can create the RAM content.
-(Do not forget: this is a pure John von Neumann architecture, data and program in the same memory)
+(Do not forget: this is a pure John von Neumann architecture, data and program are in the same memory)
@@ -43,11 +43,11 @@ BIT |15 14 13 12|11 10 9 8 7 6 5 4 3 2 1 0|
 
 This machine has the following registers:
 
-* 16 BIT Instruction Register (4 BIT OP, 12 BIT Adr)
+* 16 BIT Instruction Register (4 BIT OP, 12 BIT Addr)
 * 16 BIT Accumulator
 * 12 BIT Program Counter
 
-Example: 0001000000001010 on RAM position 0 
+Example: 0001000000001010 at RAM position 0
0001 means: LOAD the content of ADDRESS 000000001010 into the ACCU diff --git a/makefile b/makefile index 574eafe..642bae4 100644 --- a/makefile +++ b/makefile @@ -7,7 +7,7 @@ DEBUG = -DNDEBUG VPATH = src #--------------Linker-Part----------------- -toy_cpu : main.o toy.o helper.o +toy-CPU : main.o toy.o helper.o echo $@ is now linked $(CC) $(LDFLAGS) -o $@ $^ #--------------Compiler-Part--------------- diff --git a/src/toy.c b/src/toy.c index b66c425..56b0c57 100644 --- a/src/toy.c +++ b/src/toy.c @@ -173,6 +173,6 @@ bool execute(uint8_t op_code, int data_addr, uint16_t *ram) // jump if true case 14: ; break; //NOP case 15: ; break; //NOP } - return jump; + return jump; }