Skip to content

Commit

Permalink
fixed allocating twice as much RAM as needed
Browse files Browse the repository at this point in the history
  • Loading branch information
ryban committed Apr 10, 2012
1 parent 6c3cee4 commit 526e99f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LIBFLAGS = -lsfml-graphics -lsfml-window -lsfml-system -lGLU -lGL
dcppu: dcpu.o emu.cpp
g++ -o dcppu emu.cpp dcpu.o $(LIBFLAGS)

dcpu.o: dcpu.cpp
dcpu.o: dcpu.cpp dcpu.h
g++ -c dcpu.cpp

clean:
Expand Down
2 changes: 1 addition & 1 deletion dcpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using namespace std;

#include <sys/time.h>

#define RAM_SIZE 0x10000
#define RAM_SIZE 0xffff // 64k words, 128k bytes
#define NUM_REG 8
#define CLOCK_SPEED 100000 // 100k Hz

Expand Down
2 changes: 1 addition & 1 deletion non-sfml/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dcppu: dcpu.o emu.cpp
g++ -o dcppu emu.cpp dcpu.o

dcpu.o: dcpu.cpp
dcpu.o: dcpu.cpp dcpu.h
g++ -c dcpu.cpp

clean:
Expand Down
2 changes: 1 addition & 1 deletion non-sfml/dcpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using namespace std;

#include <sys/time.h>

#define RAM_SIZE 0x10000
#define RAM_SIZE 0xffff
#define NUM_REG 8
#define CLOCK_SPEED 100000 // 100k Hz

Expand Down

0 comments on commit 526e99f

Please sign in to comment.