Skip to content

Commit

Permalink
tabs, valgrind
Browse files Browse the repository at this point in the history
  • Loading branch information
steveman committed Oct 1, 2002
1 parent cb30e0b commit ee2d03b
Show file tree
Hide file tree
Showing 49 changed files with 379 additions and 365 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ version 0.7.0:
- virtual file system (VFS) rewritten, VFS viewer rewritten
- many bugs fixed

* further Valgrinding
* help hang bug fixed
* Resize problems fixed

* FIXED: htanaly: nicht gut: 'c' geht nicht in edit-mode
* LE * fixes

Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pestruct.cc coff_s.cc mzstruct.cc defreg.h defreg.c htdisasm.cc htdisasm.h \
htcoffimg.cc htcoffimg.h nestruct.cc htneimg.cc htneimg.h htneimp.cc htneimp.h \
cmds.cc cmds.h qword.cc qword.h snprintf.cc snprintf.h htpeil.cc htpeil.h \
ilstruct.cc ilstruct.h log.cc log.h classimg.cc classimg.h terminal.cc terminal.h \
vfs.cc vfs.h vfsview.cc vfsview.h
vfs.cc vfs.h vfsview.cc vfsview.h htlevxd.cc htlevxd.h lestruct.cc

dist2: distdir
-chmod -R a+r $(distdir)
Expand Down
25 changes: 13 additions & 12 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ ht_LDADD = $(ANALYSER_DIR)/libanalyser.a $(ASM_DIR)/libasm.a $(INFO_DIR)/libinfo
ht_LDFLAGS = @HT_LDFLAGS@
ht_LIBS = @HT_LIBS@

ht_SOURCES = htdoc.c htdoc.h blockop.cc blockop.h coff_s.h common.cc common.h config.h cstream.cc cstream.h demangle.h elfstruc.h htendian.cc htendian.h formats.cc formats.h global.h htanaly.cc htanaly.h htapp.cc htapp.h htatom.cc htatom.h htcfg.cc htcfg.h htclipboard.cc htclipboard.h htcoff.cc htcoff.h htcoffhd.cc htcoffhd.h htctrl.cc htctrl.h htdata.cc htdata.h htdebug.cc htdebug.h htdialog.cc htdialog.h htelf.cc htelf.h htelfhd.cc htelfhd.h htelfimg.cc htelfimg.h htelfphs.cc htelfphs.h htelfshs.cc htelfshs.h htelfsym.cc htelfsym.h htelfrel.cc htelfrel.h htfinfo.cc htfinfo.h htformat.cc htformat.h hthex.cc hthex.h hthist.cc hthist.h htidle.cc htidle.h htinfo.cc htinfo.h htiobox.cc htiobox.h htle.cc htle.h htleent.cc htleent.h htlehead.cc htlehead.h htleimg.cc htleimg.h htleobj.cc htleobj.h htlepage.cc htlepage.h htmenu.cc htmenu.h htmz.cc htmz.h htmzhead.cc htmzhead.h htmzimg.cc htmzimg.h htmzrel.cc htmzrel.h htne.cc htne.h htneent.cc htneent.h htnehead.cc htnehead.h htnenms.cc htnenms.h htneobj.cc htneobj.h htnewexe.cc htnewexe.h htobj.cc htobj.h htpal.cc htpal.h htpe.cc htpe.h htpedimp.cc htpedimp.h htpeexp.cc htpeexp.h htpehead.cc htpehead.h htpeimg.cc htpeimg.h htpeimp.cc htpeimp.h htperes.cc htperes.h htreg.cc htreg.h htsearch.cc htsearch.h htstring.cc htstring.h htstruct.cc htstruct.h httag.cc httag.h httree.cc httree.h lestruct.h main.cc mzstruct.h nestruct.h pestruct.h regex.h store.cc store.h stream.cc stream.h tools.cc tools.h vxd.cc vxd.h vxdserv.cc vxdserv.h cplus-dem.c demangle.h regex.c regex.h syntax.cc syntax.h textfile.cc textfile.h textedit.cc textedit.h classread.cc classview.cc class.h htexcept.cc htexcept.h httext.cc httext.h hteval.cc hteval.h relfile.cc relfile.h process.cc process.h mfile.cc mfile.h elfstruc.cc pestruct.cc coff_s.cc mzstruct.cc defreg.h defreg.c htdisasm.cc htdisasm.h htcoffimg.cc htcoffimg.h nestruct.cc htneimg.cc htneimg.h htneimp.cc htneimp.h cmds.cc cmds.h qword.cc qword.h snprintf.cc snprintf.h htpeil.cc htpeil.h ilstruct.cc ilstruct.h log.cc log.h classimg.cc classimg.h terminal.cc terminal.h vfs.cc vfs.h vfsview.cc vfsview.h
ht_SOURCES = htdoc.c htdoc.h blockop.cc blockop.h coff_s.h common.cc common.h config.h cstream.cc cstream.h demangle.h elfstruc.h htendian.cc htendian.h formats.cc formats.h global.h htanaly.cc htanaly.h htapp.cc htapp.h htatom.cc htatom.h htcfg.cc htcfg.h htclipboard.cc htclipboard.h htcoff.cc htcoff.h htcoffhd.cc htcoffhd.h htctrl.cc htctrl.h htdata.cc htdata.h htdebug.cc htdebug.h htdialog.cc htdialog.h htelf.cc htelf.h htelfhd.cc htelfhd.h htelfimg.cc htelfimg.h htelfphs.cc htelfphs.h htelfshs.cc htelfshs.h htelfsym.cc htelfsym.h htelfrel.cc htelfrel.h htfinfo.cc htfinfo.h htformat.cc htformat.h hthex.cc hthex.h hthist.cc hthist.h htidle.cc htidle.h htinfo.h htiobox.cc htiobox.h htle.cc htle.h htleent.cc htleent.h htlehead.cc htlehead.h htleimg.cc htleimg.h htleobj.cc htleobj.h htlepage.cc htlepage.h htmenu.cc htmenu.h htmz.cc htmz.h htmzhead.cc htmzhead.h htmzimg.cc htmzimg.h htmzrel.cc htmzrel.h htne.cc htne.h htneent.cc htneent.h htnehead.cc htnehead.h htnenms.cc htnenms.h htneobj.cc htneobj.h htnewexe.cc htnewexe.h htobj.cc htobj.h htpal.cc htpal.h htpe.cc htpe.h htpedimp.cc htpedimp.h htpeexp.cc htpeexp.h htpehead.cc htpehead.h htpeimg.cc htpeimg.h htpeimp.cc htpeimp.h htperes.cc htperes.h htreg.cc htreg.h htsearch.cc htsearch.h htstring.cc htstring.h htstruct.cc htstruct.h httag.cc httag.h httree.cc httree.h lestruct.h main.cc mzstruct.h nestruct.h pestruct.h regex.h store.cc store.h stream.cc stream.h tools.cc tools.h vxd.cc vxd.h vxdserv.cc vxdserv.h cplus-dem.c demangle.h regex.c regex.h syntax.cc syntax.h textfile.cc textfile.h textedit.cc textedit.h classread.cc classview.cc class.h htexcept.cc htexcept.h httext.cc httext.h hteval.cc hteval.h relfile.cc relfile.h process.cc process.h mfile.cc mfile.h elfstruc.cc pestruct.cc coff_s.cc mzstruct.cc defreg.h defreg.c htdisasm.cc htdisasm.h htcoffimg.cc htcoffimg.h nestruct.cc htneimg.cc htneimg.h htneimp.cc htneimp.h cmds.cc cmds.h qword.cc qword.h snprintf.cc snprintf.h htpeil.cc htpeil.h ilstruct.cc ilstruct.h log.cc log.h classimg.cc classimg.h terminal.cc terminal.h vfs.cc vfs.h vfsview.cc vfsview.h htlevxd.cc htlevxd.h lestruct.cc

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Expand All @@ -115,17 +115,18 @@ ht_OBJECTS = htdoc.o blockop.o common.o cstream.o htendian.o formats.o \
htanaly.o htapp.o htatom.o htcfg.o htclipboard.o htcoff.o htcoffhd.o \
htctrl.o htdata.o htdebug.o htdialog.o htelf.o htelfhd.o htelfimg.o \
htelfphs.o htelfshs.o htelfsym.o htelfrel.o htfinfo.o htformat.o \
hthex.o hthist.o htidle.o htinfo.o htiobox.o htle.o htleent.o \
htlehead.o htleimg.o htleobj.o htlepage.o htmenu.o htmz.o htmzhead.o \
htmzimg.o htmzrel.o htne.o htneent.o htnehead.o htnenms.o htneobj.o \
htnewexe.o htobj.o htpal.o htpe.o htpedimp.o htpeexp.o htpehead.o \
htpeimg.o htpeimp.o htperes.o htreg.o htsearch.o htstring.o htstruct.o \
httag.o httree.o main.o store.o stream.o tools.o vxd.o vxdserv.o \
cplus-dem.o regex.o syntax.o textfile.o textedit.o classread.o \
classview.o htexcept.o httext.o hteval.o relfile.o process.o mfile.o \
elfstruc.o pestruct.o coff_s.o mzstruct.o defreg.o htdisasm.o \
htcoffimg.o nestruct.o htneimg.o htneimp.o cmds.o qword.o snprintf.o \
htpeil.o ilstruct.o log.o classimg.o terminal.o vfs.o vfsview.o
hthex.o hthist.o htidle.o htiobox.o htle.o htleent.o htlehead.o \
htleimg.o htleobj.o htlepage.o htmenu.o htmz.o htmzhead.o htmzimg.o \
htmzrel.o htne.o htneent.o htnehead.o htnenms.o htneobj.o htnewexe.o \
htobj.o htpal.o htpe.o htpedimp.o htpeexp.o htpehead.o htpeimg.o \
htpeimp.o htperes.o htreg.o htsearch.o htstring.o htstruct.o httag.o \
httree.o main.o store.o stream.o tools.o vxd.o vxdserv.o cplus-dem.o \
regex.o syntax.o textfile.o textedit.o classread.o classview.o \
htexcept.o httext.o hteval.o relfile.o process.o mfile.o elfstruc.o \
pestruct.o coff_s.o mzstruct.o defreg.o htdisasm.o htcoffimg.o \
nestruct.o htneimg.o htneimp.o cmds.o qword.o snprintf.o htpeil.o \
ilstruct.o log.o classimg.o terminal.o vfs.o vfsview.o htlevxd.o \
lestruct.o
ht_DEPENDENCIES = $(ANALYSER_DIR)/libanalyser.a $(ASM_DIR)/libasm.a \
$(INFO_DIR)/libinfo.a $(IO_DIR)/libhtio.a $(OUTPUT_DIR)/liboutput.a \
$(COMIO_DIR)/libcomio.a $(EVAL_DIR)/libhteval.a $(MINILZO_DIR)/liblzo.a \
Expand Down
15 changes: 10 additions & 5 deletions TODO
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
- next unexplored
- out_addr *analyser_output::get_addr(ADDR Addr) no cur_out_addr==NULL test
- htanaly.cc: menu ifs not used properly (for keys...)
- (listbox sort order indicators ?)
- htanaly.cc:473 fix it. fix what ?
- analy_x86: AnalyX86Disassembler::createAddress() fix it.
- analy.cc: pushAddress(x,y) leaks x if !isValidCodeAddr(x)
- analy.cc: analyser file storage: thresholds are stored after data structures
which they are used for.

+dunno
- update help
Expand All @@ -25,15 +27,18 @@
- store.cc:60: getObject quits with invalid config file
- snprintf.cc needs correct indentation
- disasm (esp. x86) switch 16/32 correctly
- elf_analy.cc:114 free object ???
- classread/view.cc
- rename to match PE/ELF/LE,etc.'s behaviour
- shared data not freed

+steves
- (HT_0_7)
- SPARC_SHIT configure
- NO_NATIVE_UNALIGNED_MOVES in configure (aka SPARC_SHIT)
- implement POSIX - sys_truncate
- resize problem in XX/image regressed
(open file from project window, goto image and resize to fullscreen)

- new instead of malloc
- terminal.cc: terminal needs line buffering

- FIXED ?: HT crash when only htcfg-header in ht.cfg

Expand Down
2 changes: 1 addition & 1 deletion analyser/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ language.cc language.h pe_analy.cc pe_analy.h stddata.cc stddata.h \
elf_analy.cc elf_analy.h analy_register.cc analy_register.h \
coff_analy.cc coff_analy.h analy_java.cc analy_java.h \
class_analy.cc class_analy.h ne_analy.cc ne_analy.h \
analy_il.cc analy_il.h analy_ia64.cc analy_ia64.h
analy_il.cc analy_il.h analy_ia64.cc analy_ia64.h le_analy.cc le_analy.h

INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/asm -I$(top_srcdir)/io/@IO_DIR@ -I$(top_srcdir)/io -I$(top_srcdir)/output -I$(top_srcdir)/eval

4 changes: 2 additions & 2 deletions analyser/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ AUTOMAKE_OPTIONS = foreign

noinst_LIBRARIES = libanalyser.a

libanalyser_a_SOURCES = analy.cc analy.h analy_alpha.cc analy_alpha.h analy_names.cc analy_names.h analy_x86.cc analy_x86.h analyinfo.h code_analy.cc code_analy.h data_analy.cc data_analy.h language.cc language.h pe_analy.cc pe_analy.h stddata.cc stddata.h elf_analy.cc elf_analy.h analy_register.cc analy_register.h coff_analy.cc coff_analy.h analy_java.cc analy_java.h class_analy.cc class_analy.h ne_analy.cc ne_analy.h analy_il.cc analy_il.h analy_ia64.cc analy_ia64.h
libanalyser_a_SOURCES = analy.cc analy.h analy_alpha.cc analy_alpha.h analy_names.cc analy_names.h analy_x86.cc analy_x86.h analyinfo.h code_analy.cc code_analy.h data_analy.cc data_analy.h language.cc language.h pe_analy.cc pe_analy.h stddata.cc stddata.h elf_analy.cc elf_analy.h analy_register.cc analy_register.h coff_analy.cc coff_analy.h analy_java.cc analy_java.h class_analy.cc class_analy.h ne_analy.cc ne_analy.h analy_il.cc analy_il.h analy_ia64.cc analy_ia64.h le_analy.cc le_analy.h


INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/asm -I$(top_srcdir)/io/@IO_DIR@ -I$(top_srcdir)/io -I$(top_srcdir)/output -I$(top_srcdir)/eval
Expand All @@ -98,7 +98,7 @@ libanalyser_a_LIBADD =
libanalyser_a_OBJECTS = analy.o analy_alpha.o analy_names.o analy_x86.o \
code_analy.o data_analy.o language.o pe_analy.o stddata.o elf_analy.o \
analy_register.o coff_analy.o analy_java.o class_analy.o ne_analy.o \
analy_il.o analy_ia64.o
analy_il.o analy_ia64.o le_analy.o
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
Expand Down
6 changes: 5 additions & 1 deletion analyser/analy.cc
Original file line number Diff line number Diff line change
Expand Up @@ -646,13 +646,17 @@ int Analyser::load(ht_object_stream *st)
GET_OBJECT(st, explored);
GET_OBJECT(st, initialized);

cur_addr_ops = cur_label_ops = 1;
setLocationTreeOptimizeThreshold(1000);
setSymbolTreeOptimizeThreshold(1000);

GET_INT_DEC(st, location_count);
loadlocations(st, locations, location_count, location_count);

if (st->get_error()) return st->get_error();

resolveaddrs(this, locations);

GET_INT_DEC(st, symbol_count);
loadsymbols(this, st, symbols, symbol_count, symbol_count);

Expand Down
6 changes: 3 additions & 3 deletions analyser/analy_x86.cc
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ int AddressX86_1616::stringSize()
void AnalyX86Disassembler::init(Analyser *A, int f)
{
flags = f;
createUnasm();
createUnasm();
AnalyDisassembler::init(A);
}

Expand Down Expand Up @@ -477,13 +477,13 @@ Address *AnalyX86Disassembler::createAddress(word segment, dword offset)

void AnalyX86Disassembler::createUnasm()
{
if (flags & ANALYX86DISASSEMBLER_FLAGS_VXD_X86DIS) {
if (flags & ANALYX86DISASSEMBLER_FLAGS_VXD_X86DIS) {
if (flags & ANALYX86DISASSEMBLER_FLAGS_16BIT) {
disasm = new x86dis_vxd(X86_OPSIZE16, X86_ADDRSIZE16);
} else {
disasm = new x86dis_vxd(X86_OPSIZE32, X86_ADDRSIZE32);
}
} else {
} else {
if (flags & ANALYX86DISASSEMBLER_FLAGS_16BIT) {
disasm = new x86dis(X86_OPSIZE16, X86_ADDRSIZE16);
} else {
Expand Down
78 changes: 39 additions & 39 deletions analyser/le_analy.cc
Original file line number Diff line number Diff line change
Expand Up @@ -96,45 +96,45 @@ void LEAnalyser::beginAnalysis()
* entrypoint
*/

LEAddress a;
Address *control = NULL;
Address *v86control = NULL;
Address *pmcontrol = NULL;
if (le_shared->is_vxd) {
LEAddress addr;
int temp;

addr = le_shared->vxd_desc.v86_ctrl_ofs;
LEAddress a;
Address *control = NULL;
Address *v86control = NULL;
Address *pmcontrol = NULL;
if (le_shared->is_vxd) {
LEAddress addr;
int temp;

addr = le_shared->vxd_desc.v86_ctrl_ofs;
if (LE_addr_to_segment(le_shared, addr, &temp)) {
a = LE_MAKE_ADDR(le_shared, LE_ADDR_SEG(le_shared, addr),
LE_ADDR_OFS(le_shared, addr));
a = LE_MAKE_ADDR(le_shared, LE_ADDR_SEG(le_shared, addr),
LE_ADDR_OFS(le_shared, addr));
v86control = createAddressFlat32(a);
le_shared->best_entrypoint = a;
le_shared->best_entrypoint = a;
}

addr = le_shared->vxd_desc.pm_ctrl_ofs;
addr = le_shared->vxd_desc.pm_ctrl_ofs;
if (LE_addr_to_segment(le_shared, addr, &temp)) {
a = LE_MAKE_ADDR(le_shared, LE_ADDR_SEG(le_shared, addr),
LE_ADDR_OFS(le_shared, addr));
a = LE_MAKE_ADDR(le_shared, LE_ADDR_SEG(le_shared, addr),
LE_ADDR_OFS(le_shared, addr));
pmcontrol = createAddressFlat32(a);
le_shared->best_entrypoint = a;
le_shared->best_entrypoint = a;
}
addr = le_shared->vxd_desc.ctrl_ofs;
addr = le_shared->vxd_desc.ctrl_ofs;
if (LE_addr_to_segment(le_shared, addr, &temp)) {
a = LE_MAKE_ADDR(le_shared, LE_ADDR_SEG(le_shared, addr),
LE_ADDR_OFS(le_shared, addr));
a = LE_MAKE_ADDR(le_shared, LE_ADDR_SEG(le_shared, addr),
LE_ADDR_OFS(le_shared, addr));
control = createAddressFlat32(a);
le_shared->best_entrypoint = a;
le_shared->best_entrypoint = a;
}
}

Address *entry = NULL;
if (le_shared->hdr.startobj != 0) {
a = LE_MAKE_ADDR(le_shared, le_shared->hdr.startobj-1, le_shared->hdr.eip);
le_shared->best_entrypoint = a;
a = LE_MAKE_ADDR(le_shared, le_shared->hdr.startobj-1, le_shared->hdr.eip);
le_shared->best_entrypoint = a;
entry = createAddressFlat32(a);
}
}

if (v86control) pushAddress(v86control, v86control);

Expand All @@ -144,14 +144,14 @@ void LEAnalyser::beginAnalysis()

if (entry) pushAddress(entry, entry);

/*
/*
* give all sections a descriptive comment:
*/

LE_OBJECT *s = le_shared->objmap.header;
LE_OBJECT *s = le_shared->objmap.header;
char blub[100];
for (UINT i = 0; i < le_shared->objmap.count; i++) {
LEAddress la = LE_get_seg_addr(le_shared, i);
LEAddress la = LE_get_seg_addr(le_shared, i);
Address *secaddr = createAddressFlat32(la);

// UINT psize = LE_get_seg_psize(le_shared, i);
Expand Down Expand Up @@ -257,31 +257,31 @@ void LEAnalyser::beginAnalysis()
free(label);
}*/

if (le_shared->is_vxd) {
if (v86control) {
if (le_shared->is_vxd) {
if (v86control) {
addComment(v86control, 0, "");
addComment(v86control, 0, ";****************************");
addComment(v86control, 0, "; VxD V86-control procedure");
addComment(v86control, 0, ";****************************");
assignSymbol(v86control, "VxD_v86_control", label_func);
}
if (pmcontrol) {
}
if (pmcontrol) {
addComment(pmcontrol, 0, "");
addComment(pmcontrol, 0, ";****************************");
addComment(pmcontrol, 0, "; VxD PM-control procedure");
addComment(pmcontrol, 0, ";****************************");
assignSymbol(pmcontrol, "VxD_pm_control", label_func);
}
if (control) {
}
if (control) {
addComment(control, 0, "");
addComment(control, 0, ";****************************");
addComment(control, 0, "; VxD control procedure");
addComment(control, 0, ";****************************");
assignSymbol(control, "VxD_control", label_func);
}
}
}
}

if (entry) {
if (entry) {
addComment(entry, 0, "");
addComment(entry, 0, ";****************************");
addComment(entry, 0, "; program entry point");
Expand Down Expand Up @@ -321,7 +321,7 @@ UINT LEAnalyser::bufPtr(Address *Addr, byte *buf, int size)
{
FILEOFS ofs = addressToFileofs(Addr);
/* if (ofs == INVALID_FILE_OFS) {
ht_printf("%y", Addr);
ht_printf("%y", Addr);
int as=1;
}*/
assert(ofs != INVALID_FILE_OFS);
Expand Down Expand Up @@ -498,9 +498,9 @@ bool LEAnalyser::validAddress(Address *Addr, tsectype action)
ht_le_objmap *objects = &le_shared->objmap;
int sec;
LEAddress na;
if (!convertAddressToLEAddress(Addr, &na)) return false;
if (!convertAddressToLEAddress(Addr, &na)) return false;
if (!LE_addr_to_segment(le_shared, na, &sec)) return false;
LEAddress temp;
LEAddress temp;
bool init = LE_addr_to_ofs(le_shared, na, &temp);
LE_OBJECT *s = objects->header + sec;

Expand Down
5 changes: 3 additions & 2 deletions asm/x86dis.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1134,8 +1134,9 @@ dis_insn *x86dis_vxd::decode(byte *code, byte maxlen, CPU_ADDR addr)
insn.op[0].type = X86_OPTYPE_USER;
insn.op[0].user[0] = *(word*)(code+4);
insn.op[0].user[1] = (int)v->name;

char *vs = find_vxd_service(v->services, *(word*)(code+2) & 0x7fff);

char *vs = NULL;
if (v->services) vs = find_vxd_service(v->services, *(word*)(code+2) & 0x7fff);

if (vs) {
insn.op[1].type = X86_OPTYPE_USER;
Expand Down
2 changes: 1 addition & 1 deletion classread.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ ClassMethod::~ClassMethod()

int ClassMethod::compareTo(const Object *obj) const
{
ClassMethod *cm = (ClassMethod*)obj;
ClassMethod *cm = (ClassMethod*)obj;
if ((start + length - 1) < cm->start) return -1;
if (start > (cm->start + cm->length - 1)) return 1;
return 0;
Expand Down
2 changes: 1 addition & 1 deletion classview.cc
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ static ht_view *class_view(bounds *b, ht_streamfile *file, ht_format_group *grou
void cview::init(bounds *b, ht_streamfile *f, format_viewer_if **ifs,
ht_format_group *g, FILEOFS header_ofs)
{
ht_format_group::init(b, VO_SELECTABLE|VO_BROWSABLE, DESC_JAVA, f, false, true, 0, g);
ht_format_group::init(b, VO_SELECTABLE | VO_BROWSABLE | VO_RESIZE, DESC_JAVA, f, false, true, 0, g);

shared_data = (void*)class_read(f);
ht_format_group::init_ifs(ifs);
Expand Down
4 changes: 2 additions & 2 deletions eval/eval.cc
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static int hexdigit(char a)
static void str2int(char *str, qword *q, int base)
{
*q = to_qword(0);
qword qbase = to_qword(base);
qword qbase = to_qword(base);
while (*str) {
int c = hexdigit(*str);
if ((c == -1) || (c >= base)) break;
Expand Down Expand Up @@ -370,7 +370,7 @@ void scalar_context_str(const eval_scalar *s, eval_str *t)
case SCALAR_INT: {
char buf[64];
ht_snprintf(buf, sizeof buf, "%qd",
/* FIXME: by reference*/ &s->scalar.integer.value);
/* FIXME: by reference*/ &s->scalar.integer.value);
t->value = (char*)strdup(buf);
t->len = strlen(buf);
break;
Expand Down
1 change: 1 addition & 0 deletions htanaly.cc
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ void SymbolBox::init(bounds *b, Analyser *Analy)
ht_listbox::init(b);
str = (char *)smalloc(1024);
symbols = analy->getSymbolCount();
idle_count = 1;
}

void SymbolBox::done()
Expand Down
Loading

0 comments on commit ee2d03b

Please sign in to comment.