ag386int.pas 23 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661
  1. {
  2. $Id$
  3. Copyright (c) 1998-2000 by Florian Klaempfl
  4. This unit implements an asmoutput class for Intel syntax with Intel i386+
  5. This program is free software; you can redistribute it and/or modify
  6. it under the terms of the GNU General Public License as published by
  7. the Free Software Foundation; either version 2 of the License, or
  8. (at your option) any later version.
  9. This program is distributed in the hope that it will be useful,
  10. but WITHOUT ANY WARRANTY; without even the implied warranty of
  11. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  12. GNU General Public License for more details.
  13. You should have received a copy of the GNU General Public License
  14. along with this program; if not, write to the Free Software
  15. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  16. ****************************************************************************
  17. }
  18. unit ag386int;
  19. {$i defines.inc}
  20. interface
  21. uses aasm,assemble;
  22. type
  23. pi386intasmlist=^ti386intasmlist;
  24. ti386intasmlist = object(tasmlist)
  25. procedure WriteTree(p:paasmoutput);virtual;
  26. procedure WriteAsmList;virtual;
  27. procedure WriteExternals;
  28. end;
  29. implementation
  30. uses
  31. {$ifdef delphi}
  32. sysutils,
  33. {$else}
  34. strings,
  35. {$endif}
  36. cutils,globtype,globals,systems,cobjects,
  37. fmodule,finput,verbose,cpubase,cpuasm
  38. {$ifdef GDB}
  39. ,gdb
  40. {$endif GDB}
  41. ;
  42. const
  43. line_length = 70;
  44. function single2str(d : single) : string;
  45. var
  46. hs : string;
  47. p : byte;
  48. begin
  49. str(d,hs);
  50. { nasm expects a lowercase e }
  51. p:=pos('E',hs);
  52. if p>0 then
  53. hs[p]:='e';
  54. p:=pos('+',hs);
  55. if p>0 then
  56. delete(hs,p,1);
  57. single2str:=lower(hs);
  58. end;
  59. function double2str(d : double) : string;
  60. var
  61. hs : string;
  62. p : byte;
  63. begin
  64. str(d,hs);
  65. { nasm expects a lowercase e }
  66. p:=pos('E',hs);
  67. if p>0 then
  68. hs[p]:='e';
  69. p:=pos('+',hs);
  70. if p>0 then
  71. delete(hs,p,1);
  72. double2str:=lower(hs);
  73. end;
  74. function extended2str(e : extended) : string;
  75. var
  76. hs : string;
  77. p : byte;
  78. begin
  79. str(e,hs);
  80. { nasm expects a lowercase e }
  81. p:=pos('E',hs);
  82. if p>0 then
  83. hs[p]:='e';
  84. p:=pos('+',hs);
  85. if p>0 then
  86. delete(hs,p,1);
  87. extended2str:=lower(hs);
  88. end;
  89. function comp2str(d : bestreal) : string;
  90. type
  91. pdouble = ^double;
  92. var
  93. c : comp;
  94. dd : pdouble;
  95. begin
  96. {$ifdef FPC}
  97. c:=comp(d);
  98. {$else}
  99. c:=d;
  100. {$endif}
  101. dd:=pdouble(@c); { this makes a bitwise copy of c into a double }
  102. comp2str:=double2str(dd^);
  103. end;
  104. function getreferencestring(var ref : treference) : string;
  105. var
  106. s : string;
  107. first : boolean;
  108. begin
  109. if ref.is_immediate then
  110. begin
  111. getreferencestring:=tostr(ref.offset);
  112. exit;
  113. end
  114. else
  115. with ref do
  116. begin
  117. first:=true;
  118. inc(offset,offsetfixup);
  119. offsetfixup:=0;
  120. if ref.segment<>R_NO then
  121. s:=int_reg2str[segment]+':['
  122. else
  123. s:='[';
  124. if assigned(symbol) then
  125. begin
  126. s:=s+symbol^.name;
  127. first:=false;
  128. end;
  129. if (base<>R_NO) then
  130. begin
  131. if not(first) then
  132. s:=s+'+'
  133. else
  134. first:=false;
  135. s:=s+int_reg2str[base];
  136. end;
  137. if (index<>R_NO) then
  138. begin
  139. if not(first) then
  140. s:=s+'+'
  141. else
  142. first:=false;
  143. s:=s+int_reg2str[index];
  144. if scalefactor<>0 then
  145. s:=s+'*'+tostr(scalefactor);
  146. end;
  147. if offset<0 then
  148. s:=s+tostr(offset)
  149. else if (offset>0) then
  150. s:=s+'+'+tostr(offset);
  151. s:=s+']';
  152. end;
  153. getreferencestring:=s;
  154. end;
  155. function getopstr(const o:toper;s : topsize; opcode: tasmop;dest : boolean) : string;
  156. var
  157. hs : string;
  158. begin
  159. case o.typ of
  160. top_reg :
  161. getopstr:=int_reg2str[o.reg];
  162. top_const :
  163. getopstr:=tostr(o.val);
  164. top_symbol :
  165. begin
  166. if assigned(o.sym) then
  167. hs:='offset '+o.sym^.name
  168. else
  169. hs:='offset ';
  170. if o.symofs>0 then
  171. hs:=hs+'+'+tostr(o.symofs)
  172. else
  173. if o.symofs<0 then
  174. hs:=hs+tostr(o.symofs)
  175. else
  176. if not(assigned(o.sym)) then
  177. hs:=hs+'0';
  178. getopstr:=hs;
  179. end;
  180. top_ref :
  181. begin
  182. hs:=getreferencestring(o.ref^);
  183. if ((opcode <> A_LGS) and (opcode <> A_LSS) and
  184. (opcode <> A_LFS) and (opcode <> A_LDS) and
  185. (opcode <> A_LES)) then
  186. Begin
  187. case s of
  188. S_B : hs:='byte ptr '+hs;
  189. S_W : hs:='word ptr '+hs;
  190. S_L : hs:='dword ptr '+hs;
  191. S_IS : hs:='word ptr '+hs;
  192. S_IL : hs:='dword ptr '+hs;
  193. S_IQ : hs:='qword ptr '+hs;
  194. S_FS : hs:='dword ptr '+hs;
  195. S_FL : hs:='qword ptr '+hs;
  196. S_FX : hs:='tbyte ptr '+hs;
  197. S_BW : if dest then
  198. hs:='word ptr '+hs
  199. else
  200. hs:='byte ptr '+hs;
  201. S_BL : if dest then
  202. hs:='dword ptr '+hs
  203. else
  204. hs:='byte ptr '+hs;
  205. S_WL : if dest then
  206. hs:='dword ptr '+hs
  207. else
  208. hs:='word ptr '+hs;
  209. end;
  210. end;
  211. getopstr:=hs;
  212. end;
  213. else
  214. internalerror(10001);
  215. end;
  216. end;
  217. function getopstr_jmp(const o:toper) : string;
  218. var
  219. hs : string;
  220. begin
  221. case o.typ of
  222. top_reg :
  223. getopstr_jmp:=int_reg2str[o.reg];
  224. top_const :
  225. getopstr_jmp:=tostr(o.val);
  226. top_symbol :
  227. begin
  228. hs:=o.sym^.name;
  229. if o.symofs>0 then
  230. hs:=hs+'+'+tostr(o.symofs)
  231. else
  232. if o.symofs<0 then
  233. hs:=hs+tostr(o.symofs);
  234. getopstr_jmp:=hs;
  235. end;
  236. top_ref :
  237. getopstr_jmp:=getreferencestring(o.ref^);
  238. else
  239. internalerror(10001);
  240. end;
  241. end;
  242. {****************************************************************************
  243. TI386INTASMLIST
  244. ****************************************************************************}
  245. var
  246. LastSec : tsection;
  247. const
  248. ait_const2str:array[ait_const_32bit..ait_const_8bit] of string[8]=
  249. (#9'DD'#9,#9'DW'#9,#9'DB'#9);
  250. Function PadTabs(const p:string;addch:char):string;
  251. var
  252. s : string;
  253. i : longint;
  254. begin
  255. i:=length(p);
  256. if addch<>#0 then
  257. begin
  258. inc(i);
  259. s:=p+addch;
  260. end
  261. else
  262. s:=p;
  263. if i<8 then
  264. PadTabs:=s+#9#9
  265. else
  266. PadTabs:=s+#9;
  267. end;
  268. procedure ti386intasmlist.WriteTree(p:paasmoutput);
  269. const
  270. allocstr : array[boolean] of string[10]=(' released',' allocated');
  271. var
  272. s,
  273. prefix,
  274. suffix : string;
  275. hp : pai;
  276. counter,
  277. lines,
  278. i,j,l : longint;
  279. consttyp : tait;
  280. found,
  281. quoted : boolean;
  282. sep : char;
  283. begin
  284. if not assigned(p) then
  285. exit;
  286. hp:=pai(p^.first);
  287. while assigned(hp) do
  288. begin
  289. case hp^.typ of
  290. ait_comment : Begin
  291. AsmWrite(target_asm.comment);
  292. AsmWritePChar(pai_asm_comment(hp)^.str);
  293. AsmLn;
  294. End;
  295. ait_regalloc,
  296. ait_tempalloc : ;
  297. ait_section : begin
  298. if LastSec<>sec_none then
  299. AsmWriteLn('_'+target_asm.secnames[LastSec]+#9#9'ENDS');
  300. if pai_section(hp)^.sec<>sec_none then
  301. begin
  302. AsmLn;
  303. AsmWriteLn('_'+target_asm.secnames[pai_section(hp)^.sec]+#9#9+
  304. 'SEGMENT'#9'PARA PUBLIC USE32 '''+
  305. target_asm.secnames[pai_section(hp)^.sec]+'''');
  306. end;
  307. LastSec:=pai_section(hp)^.sec;
  308. end;
  309. ait_align : begin
  310. { CAUSES PROBLEMS WITH THE SEGMENT DEFINITION }
  311. { SEGMENT DEFINITION SHOULD MATCH TYPE OF ALIGN }
  312. { HERE UNDER TASM! }
  313. AsmWriteLn(#9'ALIGN '+tostr(pai_align(hp)^.aligntype));
  314. end;
  315. ait_datablock : begin
  316. if pai_datablock(hp)^.is_global then
  317. AsmWriteLn(#9'PUBLIC'#9+pai_datablock(hp)^.sym^.name);
  318. AsmWriteLn(PadTabs(pai_datablock(hp)^.sym^.name,#0)+'DB'#9+tostr(pai_datablock(hp)^.size)+' DUP(?)');
  319. end;
  320. ait_const_32bit,
  321. ait_const_8bit,
  322. ait_const_16bit : begin
  323. AsmWrite(ait_const2str[hp^.typ]+tostr(pai_const(hp)^.value));
  324. consttyp:=hp^.typ;
  325. l:=0;
  326. repeat
  327. found:=(not (Pai(hp^.next)=nil)) and (Pai(hp^.next)^.typ=consttyp);
  328. if found then
  329. begin
  330. hp:=Pai(hp^.next);
  331. s:=','+tostr(pai_const(hp)^.value);
  332. AsmWrite(s);
  333. inc(l,length(s));
  334. end;
  335. until (not found) or (l>line_length);
  336. AsmLn;
  337. end;
  338. ait_const_symbol : begin
  339. AsmWriteLn(#9#9'DD'#9'offset '+pai_const_symbol(hp)^.sym^.name);
  340. if pai_const_symbol(hp)^.offset>0 then
  341. AsmWrite('+'+tostr(pai_const_symbol(hp)^.offset))
  342. else if pai_const_symbol(hp)^.offset<0 then
  343. AsmWrite(tostr(pai_const_symbol(hp)^.offset));
  344. AsmLn;
  345. end;
  346. ait_const_rva : begin
  347. AsmWriteLn(#9#9'RVA'#9+pai_const_symbol(hp)^.sym^.name);
  348. end;
  349. ait_real_32bit : AsmWriteLn(#9#9'DD'#9+single2str(pai_real_32bit(hp)^.value));
  350. ait_real_64bit : AsmWriteLn(#9#9'DQ'#9+double2str(pai_real_64bit(hp)^.value));
  351. ait_real_80bit : AsmWriteLn(#9#9'DT'#9+extended2str(pai_real_80bit(hp)^.value));
  352. ait_comp_64bit : AsmWriteLn(#9#9'DQ'#9+comp2str(pai_real_80bit(hp)^.value));
  353. ait_string : begin
  354. counter := 0;
  355. lines := pai_string(hp)^.len div line_length;
  356. { separate lines in different parts }
  357. if pai_string(hp)^.len > 0 then
  358. Begin
  359. for j := 0 to lines-1 do
  360. begin
  361. AsmWrite(#9#9'DB'#9);
  362. quoted:=false;
  363. for i:=counter to counter+line_length do
  364. begin
  365. { it is an ascii character. }
  366. if (ord(pai_string(hp)^.str[i])>31) and
  367. (ord(pai_string(hp)^.str[i])<128) and
  368. (pai_string(hp)^.str[i]<>'"') then
  369. begin
  370. if not(quoted) then
  371. begin
  372. if i>counter then
  373. AsmWrite(',');
  374. AsmWrite('"');
  375. end;
  376. AsmWrite(pai_string(hp)^.str[i]);
  377. quoted:=true;
  378. end { if > 31 and < 128 and ord('"') }
  379. else
  380. begin
  381. if quoted then
  382. AsmWrite('"');
  383. if i>counter then
  384. AsmWrite(',');
  385. quoted:=false;
  386. AsmWrite(tostr(ord(pai_string(hp)^.str[i])));
  387. end;
  388. end; { end for i:=0 to... }
  389. if quoted then AsmWrite('"');
  390. AsmWrite(target_os.newline);
  391. counter := counter+line_length;
  392. end; { end for j:=0 ... }
  393. { do last line of lines }
  394. AsmWrite(#9#9'DB'#9);
  395. quoted:=false;
  396. for i:=counter to pai_string(hp)^.len-1 do
  397. begin
  398. { it is an ascii character. }
  399. if (ord(pai_string(hp)^.str[i])>31) and
  400. (ord(pai_string(hp)^.str[i])<128) and
  401. (pai_string(hp)^.str[i]<>'"') then
  402. begin
  403. if not(quoted) then
  404. begin
  405. if i>counter then
  406. AsmWrite(',');
  407. AsmWrite('"');
  408. end;
  409. AsmWrite(pai_string(hp)^.str[i]);
  410. quoted:=true;
  411. end { if > 31 and < 128 and " }
  412. else
  413. begin
  414. if quoted then
  415. AsmWrite('"');
  416. if i>counter then
  417. AsmWrite(',');
  418. quoted:=false;
  419. AsmWrite(tostr(ord(pai_string(hp)^.str[i])));
  420. end;
  421. end; { end for i:=0 to... }
  422. if quoted then
  423. AsmWrite('"');
  424. end;
  425. AsmLn;
  426. end;
  427. ait_label : begin
  428. if pai_label(hp)^.l^.is_used then
  429. begin
  430. AsmWrite(pai_label(hp)^.l^.name);
  431. if assigned(hp^.next) and not(pai(hp^.next)^.typ in
  432. [ait_const_32bit,ait_const_16bit,ait_const_8bit,
  433. ait_const_symbol,ait_const_rva,
  434. ait_real_32bit,ait_real_64bit,ait_real_80bit,ait_comp_64bit,ait_string]) then
  435. AsmWriteLn(':');
  436. end;
  437. end;
  438. ait_direct : begin
  439. AsmWritePChar(pai_direct(hp)^.str);
  440. AsmLn;
  441. end;
  442. ait_symbol : begin
  443. if pai_symbol(hp)^.is_global then
  444. AsmWriteLn(#9'PUBLIC'#9+pai_symbol(hp)^.sym^.name);
  445. AsmWrite(pai_symbol(hp)^.sym^.name);
  446. if assigned(hp^.next) and not(pai(hp^.next)^.typ in
  447. [ait_const_32bit,ait_const_16bit,ait_const_8bit,
  448. ait_const_symbol,ait_const_rva,
  449. ait_real_32bit,ait_real_64bit,ait_real_80bit,ait_comp_64bit,ait_string]) then
  450. AsmWriteLn(':')
  451. end;
  452. ait_symbol_end : begin
  453. end;
  454. ait_instruction : begin
  455. { Must be done with args in ATT order }
  456. paicpu(hp)^.CheckNonCommutativeOpcodes;
  457. { We need intel order, no At&t }
  458. paicpu(hp)^.SwapOperands;
  459. { Reset }
  460. suffix:='';
  461. prefix:= '';
  462. s:='';
  463. { We need to explicitely set
  464. word prefix to get selectors
  465. to be pushed in 2 bytes PM }
  466. if (paicpu(hp)^.opsize=S_W) and
  467. ((paicpu(hp)^.opcode=A_PUSH) or
  468. (paicpu(hp)^.opcode=A_POP)) and
  469. (paicpu(hp)^.oper[0].typ=top_reg) and
  470. ((paicpu(hp)^.oper[0].reg>=firstsreg) and
  471. (paicpu(hp)^.oper[0].reg<=lastsreg)) then
  472. AsmWriteln(#9#9'DB'#9'066h');
  473. { added prefix instructions, must be on same line as opcode }
  474. if (paicpu(hp)^.ops = 0) and
  475. ((paicpu(hp)^.opcode = A_REP) or
  476. (paicpu(hp)^.opcode = A_LOCK) or
  477. (paicpu(hp)^.opcode = A_REPE) or
  478. (paicpu(hp)^.opcode = A_REPNZ) or
  479. (paicpu(hp)^.opcode = A_REPZ) or
  480. (paicpu(hp)^.opcode = A_REPNE)) then
  481. Begin
  482. prefix:=int_op2str[paicpu(hp)^.opcode]+#9;
  483. hp:=Pai(hp^.next);
  484. { this is theorically impossible... }
  485. if hp=nil then
  486. begin
  487. s:=#9#9+prefix;
  488. AsmWriteLn(s);
  489. break;
  490. end;
  491. { nasm prefers prefix on a line alone }
  492. AsmWriteln(#9#9+prefix);
  493. prefix:='';
  494. end
  495. else
  496. prefix:= '';
  497. if paicpu(hp)^.ops<>0 then
  498. begin
  499. if is_calljmp(paicpu(hp)^.opcode) then
  500. s:=#9+getopstr_jmp(paicpu(hp)^.oper[0])
  501. else
  502. begin
  503. for i:=0to paicpu(hp)^.ops-1 do
  504. begin
  505. if i=0 then
  506. sep:=#9
  507. else
  508. sep:=',';
  509. s:=s+sep+getopstr(paicpu(hp)^.oper[i],paicpu(hp)^.opsize,paicpu(hp)^.opcode,(i=2));
  510. end;
  511. end;
  512. end;
  513. AsmWriteLn(#9#9+prefix+int_op2str[paicpu(hp)^.opcode]+cond2str[paicpu(hp)^.condition]+suffix+s);
  514. end;
  515. {$ifdef GDB}
  516. ait_stabn,
  517. ait_stabs,
  518. ait_force_line,
  519. ait_stab_function_name : ;
  520. {$endif GDB}
  521. ait_cut : begin
  522. { only reset buffer if nothing has changed }
  523. if AsmSize=AsmStartSize then
  524. AsmClear
  525. else
  526. begin
  527. if LastSec<>sec_none then
  528. AsmWriteLn('_'+target_asm.secnames[LastSec]+#9#9'ENDS');
  529. AsmLn;
  530. AsmWriteLn(#9'END');
  531. AsmClose;
  532. DoAssemble;
  533. AsmCreate(pai_cut(hp)^.place);
  534. end;
  535. { avoid empty files }
  536. while assigned(hp^.next) and (pai(hp^.next)^.typ in [ait_cut,ait_section,ait_comment]) do
  537. begin
  538. if pai(hp^.next)^.typ=ait_section then
  539. begin
  540. lastsec:=pai_section(hp^.next)^.sec;
  541. end;
  542. hp:=pai(hp^.next);
  543. end;
  544. AsmWriteLn(#9'.386p');
  545. { I was told that this isn't necesarry because }
  546. { the labels generated by FPC are unique (FK) }
  547. { AsmWriteLn(#9'LOCALS '+target_asm.labelprefix); }
  548. if lastsec<>sec_none then
  549. AsmWriteLn('_'+target_asm.secnames[lastsec]+#9#9+
  550. 'SEGMENT'#9'PARA PUBLIC USE32 '''+
  551. target_asm.secnames[lastsec]+'''');
  552. AsmStartSize:=AsmSize;
  553. end;
  554. ait_marker: ;
  555. else
  556. internalerror(10000);
  557. end;
  558. hp:=pai(hp^.next);
  559. end;
  560. end;
  561. var
  562. currentasmlist : PAsmList;
  563. procedure writeexternal(p:pnamedindexobject);
  564. begin
  565. if pasmsymbol(p)^.defbind=AB_EXTERNAL then
  566. currentasmlist^.AsmWriteln(#9'EXTRN'#9+p^.name);
  567. end;
  568. procedure ti386intasmlist.WriteExternals;
  569. begin
  570. currentasmlist:=@self;
  571. AsmSymbolList^.foreach({$ifdef fpcprocvar}@{$endif}writeexternal);
  572. end;
  573. procedure ti386intasmlist.WriteAsmList;
  574. begin
  575. {$ifdef EXTDEBUG}
  576. if assigned(current_module^.mainsource) then
  577. comment(v_info,'Start writing intel-styled assembler output for '+current_module^.mainsource^);
  578. {$endif}
  579. LastSec:=sec_none;
  580. AsmWriteLn(#9'.386p');
  581. AsmWriteLn(#9'LOCALS '+target_asm.labelprefix);
  582. AsmWriteLn('DGROUP'#9'GROUP'#9'_BSS,_DATA');
  583. AsmWriteLn(#9'ASSUME'#9'CS:_CODE,ES:DGROUP,DS:DGROUP,SS:DGROUP');
  584. AsmLn;
  585. countlabelref:=false;
  586. WriteExternals;
  587. { INTEL ASM doesn't support stabs
  588. WriteTree(debuglist);}
  589. WriteTree(codesegment);
  590. WriteTree(datasegment);
  591. WriteTree(consts);
  592. WriteTree(rttilist);
  593. WriteTree(resourcestringlist);
  594. WriteTree(bsssegment);
  595. countlabelref:=true;
  596. AsmWriteLn(#9'END');
  597. AsmLn;
  598. {$ifdef EXTDEBUG}
  599. if assigned(current_module^.mainsource) then
  600. comment(v_info,'Done writing intel-styled assembler output for '+current_module^.mainsource^);
  601. {$endif EXTDEBUG}
  602. end;
  603. end.
  604. {
  605. $Log$
  606. Revision 1.6 2000-09-24 15:06:10 peter
  607. * use defines.inc
  608. Revision 1.5 2000/08/27 16:11:49 peter
  609. * moved some util functions from globals,cobjects to cutils
  610. * splitted files into finput,fmodule
  611. Revision 1.4 2000/08/20 17:38:21 peter
  612. * smartlinking fixed for linux (merged)
  613. Revision 1.3 2000/07/13 12:08:24 michael
  614. + patched to 1.1.0 with former 1.09patch from peter
  615. Revision 1.2 2000/07/13 11:32:30 michael
  616. + removed logs
  617. }