diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | miasm/analysis/binary.py | 4 | ||||
| -rw-r--r-- | miasm/arch/mips32/sem.py | 2 | ||||
| -rw-r--r-- | miasm/arch/ppc/sem.py | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/README.md b/README.md index dd956254..fa76a694 100644 --- a/README.md +++ b/README.md @@ -517,7 +517,9 @@ Documentation TODO -An auto-generated documentation is available [here](http://miasmdoc.ajax.re). +An auto-generated documentation is available: +* [Doxygen](http://miasm.re/miasm_doxygen) +* [pdoc](http://miasm.re/miasm_pdoc) Obtaining Miasm =============== diff --git a/miasm/analysis/binary.py b/miasm/analysis/binary.py index 0548dc9d..c278594b 100644 --- a/miasm/analysis/binary.py +++ b/miasm/analysis/binary.py @@ -64,14 +64,14 @@ class Container(object): cls.fallback_container = container @classmethod - def from_stream(cls, stream, *args, **kwargs): + def from_stream(cls, stream, loc_db, *args, **kwargs): """Instantiate a container and parse the binary @stream: stream to use as binary @vm: (optional) VmMngr instance to link with the executable @addr: (optional) Base address of the parsed binary. If set, force the unknown format """ - return Container.from_string(stream.read(), *args, **kwargs) + return Container.from_string(stream.read(), loc_db, *args, **kwargs) def parse(self, data, *args, **kwargs): """Launch parsing of @data diff --git a/miasm/arch/mips32/sem.py b/miasm/arch/mips32/sem.py index 20ef007a..c7d21aee 100644 --- a/miasm/arch/mips32/sem.py +++ b/miasm/arch/mips32/sem.py @@ -524,7 +524,7 @@ def mtlo(arg1): def clz(ir, instr, rs, rd): e = [] - e.append(ExprAssign(rd, ExprOp('cntleadzeros', rs))) + e.append(m2_expr.ExprAssign(rd, m2_expr.ExprOp('cntleadzeros', rs))) return e, [] def teq(ir, instr, arg1, arg2): diff --git a/miasm/arch/ppc/sem.py b/miasm/arch/ppc/sem.py index b05348f7..6d18777c 100644 --- a/miasm/arch/ppc/sem.py +++ b/miasm/arch/ppc/sem.py @@ -418,7 +418,7 @@ def mn_mtspr(ir, instr, arg1, arg2): ExprAssign(exception_flags, ExprInt(EXCEPT_SPR_ACCESS, 32)) ], [] def mn_mtsr(ir, instr, sr, rs): - srid = sr.arg.arg + srid = sr.arg return [ ExprAssign(sr_dict[srid], rs) ], [] # TODO @@ -426,7 +426,7 @@ def mn_mtsr(ir, instr, sr, rs): # return [ ExprAssign(sr_dict[rb[0:3]], rs) ], [] def mn_mfsr(ir, instr, rd, sr): - srid = sr.arg.arg + srid = sr.arg return [ ExprAssign(rd, sr_dict[srid]) ], [] # TODO |