projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some work on improving BitVector<->String conversions
[Mograsim.git]
/
plugins
/
net.mograsim.machine
/
src
/
net
/
mograsim
/
machine
/
standard
/
memory
/
MainMemoryParser.java
diff --git
a/plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/MainMemoryParser.java
b/plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/MainMemoryParser.java
index
ea87296
..
d52efdc
100644
(file)
--- a/
plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/MainMemoryParser.java
+++ b/
plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/MainMemoryParser.java
@@
-63,7
+63,7
@@
public class MainMemoryParser
{
for (; i <= maxAddr && reader.ready() && !"".equals((line = reader.readLine())); i++)
{
{
for (; i <= maxAddr && reader.ready() && !"".equals((line = reader.readLine())); i++)
{
- memory.setCell(i, BitVector.parse(line));
+ memory.setCell(i, BitVector.parse
Bitstring
(line));
}
}
catch (IOException e)
}
}
catch (IOException e)
@@
-86,7
+86,7
@@
public class MainMemoryParser
int val = instStream.read();
if (val == -1 && instIndex <= maxAddress)
{
int val = instStream.read();
if (val == -1 && instIndex <= maxAddress)
{
- instStream = new ByteArrayInputStream((memory.getCell(instIndex++).to
S
tring() + lineSeparator).getBytes());
+ instStream = new ByteArrayInputStream((memory.getCell(instIndex++).to
Bits
tring() + lineSeparator).getBytes());
val = instStream.read();
}
return val;
val = instStream.read();
}
return val;