fix add,or,ifthenelse issue
add funcEntryExit2
fix logic of makegraph