Skip to content

Adjust assembler to allow compiling our VM output #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2015
Merged

Adjust assembler to allow compiling our VM output #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62941b5
Handle additional mneumonics for commutative operations
Ryman Jun 14, 2015
10dd551
Abort if program is too large
Ryman Jun 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions bin/assembler
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ PREDEFINED_SYMBOLS = {
'KBD' => 0x6000
}

# Any more than this and then we overflow 15bits of address space
MAX_PROGRAM_SIZE = (2**15) -1

def add_predefined_symbols(symbols)
PREDEFINED_SYMBOLS.each do |k, v|
symbols.add_entry(k, v)
Expand All @@ -52,6 +55,8 @@ def parse_labels(input, symbols)
address += 1
end
end

raise "Program is too large: #{address} > #{MAX_PROGRAM_SIZE}" if address >= MAX_PROGRAM_SIZE
end

def generate_code(input, symbols)
Expand Down
8 changes: 7 additions & 1 deletion lib/code.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,27 @@ def comp(mnemonic)
'A+1' => '0110111',
'D-1' => '0001110',
'A-1' => '0110010',
'A+D' => '0000010',
'D+A' => '0000010',
'D-A' => '0010011',
'A-D' => '0000111',
'D&A' => '0000000',
'A&D' => '0000000',
'D|A' => '0010101',
'A|D' => '0010101',
'M' => '1110000',
'!M' => '1110001',
'-M' => '1110011',
'M+1' => '1110111',
'M-1' => '1110010',
'D+M' => '1000010',
'M+D' => '1000010',
'D-M' => '1010011',
'M-D' => '1000111',
'D&M' => '1000000',
'D|M' => '1010101'
'D|M' => '1010101',
'M&D' => '1000000',
'M|D' => '1010101',
}.fetch(mnemonic)
end

Expand Down