History

Simplified the Type class. Removed padding previously introduced for writing LDT items.

David Boddie committed 9 years ago

Commit 5b67b841 parent 6526ce11 file · +4 −10Browse files

Unified · Split

dis.py+4−10
@@ -407,19 +407,18 @@ class RuntimeFlag: · 406 unmodified lines
407407
408408 class Type:
409409
410− def __init__(self, desc_number = 0, size = 0, number_ptrs = 0, array = ""):
410+ def __init__(self, desc_number = 0, size = 0, array = ""):
411411
412412 self.desc_number = desc_number
413413 self.size = size
414− self.number_ptrs = number_ptrs
415414 self.array = array
416415
417416 def read(self, f):
418417
419418 self.desc_number = read_OP(f)
420419 self.size = read_OP(f)
421− self.number_ptrs = read_OP(f)
422− self.array = f.read(self.number_ptrs)
420+ number_ptrs = read_OP(f)
421+ self.array = f.read(number_ptrs)
423422
424423 return self
425424
@@ -445,7 +444,7 @@ class Type: · 19 unmodified lines
445444
446445 write_OP(f, self.desc_number)
447446 write_OP(f, self.size)
448− write_OP(f, self.number_ptrs)
447+ write_OP(f, len(self.array))
449448 f.write(self.array)
450449
451450
@@ -612,11 +611,6 @@ class LDT: · 160 unmodified lines
612611
613612 _write(f, ">I", self.sig)
614613 write_C(f, self.name)
615−
616− # Pad to a word boundary if necessary.
617− remainder = len(self.name) % 4
618− if remainder != 0:
619− f.write("\x00" * (4 - remainder))
620614
621615
622616 class ExceptionInfo: