Website Summary Files Commits Branches @commit @diff @stats
path: root / spasm / src / asm / main.cpp
diff options
context:
space:
mode:
Commita7cd9d4f8d83024402bacb39786e5e1a018a0a04 (patch)
Author
 Dimitar Trendafilov <dimitar@coherent-labs.com>
2018-11-14 23:45:56 +0200
Committer
 Martin Dobrev <martindobrev0@gmail.com>
2018-11-14 23:45:56 +0200
Files1f99c6f8d00d9b94b69c8f3525643344a32d7414 /spasm/src/asm/main.cpp
IPL-a7cd9d4f8d83024402bacb39786e5e1a018a0a04.tar
IPL-a7cd9d4f8d83024402bacb39786e5e1a018a0a04.tar.gz
IPL-a7cd9d4f8d83024402bacb39786e5e1a018a0a04.zip
Parent9a7a8a31e75d1b85274ef46ca29714270062809e (diff)
Spasm can assemble programs on with the new instruction set (#47)
* Use checkout as-is, commit as-is * Spasm can assemble programs based on the new instruction set
1 files changed, 4 insertions, 3 deletions
-rw-r--r--spasm/src/asm/main.cpp7
diff --git a/spasm/src/asm/main.cpp b/spasm/src/asm/main.cpp
index da8fcf6..2b33a12 100644
--- a/spasm/src/asm/main.cpp
+++ b/spasm/src/asm/main.cpp
@@ -4,12 +4,13 @@
int main(int argc, const char* argv[])
{
- if (argc != 2)
+ if (argc != 3)
return 1;
SpasmImpl::ASM::Bytecode_Memory bytecode;
- SpasmImpl::ASM::compile(std::cin, bytecode);
+ std::ifstream input(argv[1]);
+ SpasmImpl::ASM::compile(input, bytecode);
- std::ofstream output(argv[1], std::ios_base::out | std::ios_base::binary);
+ std::ofstream output(argv[2], std::ios_base::out | std::ios_base::binary);
// output.write ("SPASM", 5);
auto& bc = bytecode.bytecode();