From ddc525f8f6c9f9993fcdc4f2bf552ce566ee0e4c Mon Sep 17 00:00:00 2001
From: e5l <leonid.stashevsky@gmail.com>
Date: Thu, 18 Aug 2016 11:53:28 +0300
Subject: [PATCH] kotstd: memory analytics, car_fmw: dynamic heap tests

---
 car_fmw/src/echo.kt                           |   2 +
 car_fmw/src/include/memory.kt                 |   6 +
 kotstd/Makefile                               |   4 +-
 kotstd/lib/arm/memory.ll                      | 142 ++++++++++++++----
 kotstd/libc/memory.c                          |   8 +
 .../2.9/taskArtifacts/cache.properties.lock   | Bin 17 -> 17 bytes
 .../.gradle/2.9/taskArtifacts/fileHashes.bin  | Bin 37333 -> 37333 bytes
 .../2.9/taskArtifacts/fileSnapshots.bin       | Bin 297678 -> 308964 bytes
 .../2.9/taskArtifacts/taskArtifacts.bin       | Bin 26026 -> 26026 bytes
 9 files changed, 134 insertions(+), 28 deletions(-)
 create mode 100644 car_fmw/src/include/memory.kt

diff --git a/car_fmw/src/echo.kt b/car_fmw/src/echo.kt
index da8ba527f7e..64ed1a0948d 100644
--- a/car_fmw/src/echo.kt
+++ b/car_fmw/src/echo.kt
@@ -13,12 +13,14 @@ fun echoUsb() {
 fun echoProto() {
     clear_buffer()
 
+    set_active_heap(MEMORY_DYNAMIC_HEAP)
     while (true) {
         val route = readRoute()
         blink()
         go(route)
         blink()
         wait(PROGRAM_DURATION)
+        clean_dynamic_heap()
     }
 }
 
diff --git a/car_fmw/src/include/memory.kt b/car_fmw/src/include/memory.kt
new file mode 100644
index 00000000000..80a2088c0b8
--- /dev/null
+++ b/car_fmw/src/include/memory.kt
@@ -0,0 +1,6 @@
+
+val MEMORY_STATIC_HEAP = 0
+val MEMORY_DYNAMIC_HEAP = 1
+
+external fun set_active_heap(heap: Int)
+external fun clean_dynamic_heap()
\ No newline at end of file
diff --git a/kotstd/Makefile b/kotstd/Makefile
index f73467ffa91..dee7afeeff7 100644
--- a/kotstd/Makefile
+++ b/kotstd/Makefile
@@ -9,8 +9,8 @@ KT=$(PWD)/../translator/build/libs/translator-1.0.jar
 LLINK=llvm-link-3.6
 CC=clang-3.6
 
-CCFLAGS_ARM=-S -Wall -m32 -emit-llvm -nostdlib -ffreestanding -march=armv7-m -mthumb -flto -O0 -target arm-none-eabi -DARM
-CCFLAGS=-O0 -S -Wall -emit-llvm -nostdlib -ffreestanding
+CCFLAGS_ARM=-g -S -Wall -m32 -emit-llvm -nostdlib -ffreestanding -march=armv7-m -mthumb -flto -O0 -target arm-none-eabi -DARM
+CCFLAGS=-g -O0 -S -Wall -emit-llvm -nostdlib -ffreestanding
 LLINK_FLAGS=-S
 
 KT_ALL_DEPS=java -jar $(KT)
diff --git a/kotstd/lib/arm/memory.ll b/kotstd/lib/arm/memory.ll
index 4a7be5c0384..5fa8b087cb9 100644
--- a/kotstd/lib/arm/memory.ll
+++ b/kotstd/lib/arm/memory.ll
@@ -7,50 +7,140 @@ target triple = "thumbv7m-none--eabi"
 @heaps = global [2 x i8*] [i8* getelementptr inbounds ([30000 x i8]* @static_area, i32 0, i32 0), i8* getelementptr inbounds ([30000 x i8]* @dynamic_area, i32 0, i32 0)], align 4
 @heap_tails = global [2 x i32] zeroinitializer, align 4
 @active_heap = global i32 0, align 4
+@dynamic_heap_consume = global i32 0, align 4
+@dynamic_heap_max = global i32 0, align 4
 
 ; Function Attrs: nounwind
 define i8* @malloc_heap(i32 %size) #0 {
   %1 = alloca i32, align 4
   %ptr = alloca i8*, align 4
   store i32 %size, i32* %1, align 4
-  %2 = load i32* @active_heap, align 4
-  %3 = getelementptr inbounds [2 x i8*]* @heaps, i32 0, i32 %2
-  %4 = load i8** %3, align 4
-  %5 = load i32* @active_heap, align 4
-  %6 = getelementptr inbounds [2 x i32]* @heap_tails, i32 0, i32 %5
-  %7 = load i32* %6, align 4
-  %8 = getelementptr inbounds i8* %4, i32 %7
-  store i8* %8, i8** %ptr, align 4
-  %9 = load i32* %1, align 4
-  %10 = load i32* @active_heap, align 4
-  %11 = getelementptr inbounds [2 x i32]* @heap_tails, i32 0, i32 %10
-  %12 = load i32* %11, align 4
-  %13 = add nsw i32 %12, %9
-  store i32 %13, i32* %11, align 4
-  %14 = load i8** %ptr, align 4
-  ret i8* %14
+  call void @llvm.dbg.declare(metadata i32* %1, metadata !37, metadata !38), !dbg !39
+  call void @llvm.dbg.declare(metadata i8** %ptr, metadata !40, metadata !38), !dbg !41
+  %2 = load i32* @active_heap, align 4, !dbg !42
+  %3 = getelementptr inbounds [2 x i8*]* @heaps, i32 0, i32 %2, !dbg !43
+  %4 = load i8** %3, align 4, !dbg !43
+  %5 = load i32* @active_heap, align 4, !dbg !44
+  %6 = getelementptr inbounds [2 x i32]* @heap_tails, i32 0, i32 %5, !dbg !45
+  %7 = load i32* %6, align 4, !dbg !45
+  %8 = getelementptr inbounds i8* %4, i32 %7, !dbg !43
+  store i8* %8, i8** %ptr, align 4, !dbg !41
+  %9 = load i32* %1, align 4, !dbg !46
+  %10 = load i32* @active_heap, align 4, !dbg !47
+  %11 = getelementptr inbounds [2 x i32]* @heap_tails, i32 0, i32 %10, !dbg !48
+  %12 = load i32* %11, align 4, !dbg !48
+  %13 = add nsw i32 %12, %9, !dbg !48
+  store i32 %13, i32* %11, align 4, !dbg !48
+  %14 = load i8** %ptr, align 4, !dbg !49
+  ret i8* %14, !dbg !50
 }
 
+; Function Attrs: nounwind readnone
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
 ; Function Attrs: nounwind
 define void @set_active_heap(i32 %heap) #0 {
   %1 = alloca i32, align 4
   store i32 %heap, i32* %1, align 4
-  %2 = load i32* %1, align 4
-  store i32 %2, i32* @active_heap, align 4
-  ret void
+  call void @llvm.dbg.declare(metadata i32* %1, metadata !51, metadata !38), !dbg !52
+  %2 = load i32* %1, align 4, !dbg !53
+  store i32 %2, i32* @active_heap, align 4, !dbg !54
+  ret void, !dbg !55
 }
 
 ; Function Attrs: nounwind
 define void @clean_dynamic_heap() #0 {
-  store i32 0, i32* getelementptr inbounds ([2 x i32]* @heap_tails, i32 0, i32 1), align 4
-  ret void
+  %1 = load i32* getelementptr inbounds ([2 x i32]* @heap_tails, i32 0, i32 1), align 4, !dbg !56
+  %2 = load i32* @dynamic_heap_consume, align 4, !dbg !57
+  %3 = add nsw i32 %2, %1, !dbg !57
+  store i32 %3, i32* @dynamic_heap_consume, align 4, !dbg !57
+  %4 = load i32* getelementptr inbounds ([2 x i32]* @heap_tails, i32 0, i32 1), align 4, !dbg !58
+  %5 = load i32* @dynamic_heap_max, align 4, !dbg !60
+  %6 = icmp sgt i32 %4, %5, !dbg !58
+  br i1 %6, label %7, label %9, !dbg !61
+
+; <label>:7                                       ; preds = %0
+  %8 = load i32* getelementptr inbounds ([2 x i32]* @heap_tails, i32 0, i32 1), align 4, !dbg !62
+  store i32 %8, i32* @dynamic_heap_max, align 4, !dbg !64
+  br label %9, !dbg !65
+
+; <label>:9                                       ; preds = %7, %0
+  store i32 0, i32* getelementptr inbounds ([2 x i32]* @heap_tails, i32 0, i32 1), align 4, !dbg !66
+  ret void, !dbg !67
 }
 
 attributes #0 = { nounwind "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
 
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!32, !33, !34, !35}
+!llvm.ident = !{!36}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 1, !"min_enum_size", i32 4}
-!2 = !{!"Ubuntu clang version 3.6.2-3ubuntu2 (tags/RELEASE_362/final) (based on LLVM 3.6.2)"}
+!0 = !{!"0x11\0012\00Ubuntu clang version 3.6.2-3ubuntu2 (tags/RELEASE_362/final) (based on LLVM 3.6.2)\000\00\000\00\001", !1, !2, !2, !3, !17, !2} ; [ DW_TAG_compile_unit ] [/home/user/Documents/carkot/kotstd//home/user/Documents/carkot/kotstd/libc/memory.c] [DW_LANG_C99]
+!1 = !{!"/home/user/Documents/carkot/kotstd/libc/memory.c", !"/home/user/Documents/carkot/kotstd"}
+!2 = !{}
+!3 = !{!4, !11, !14}
+!4 = !{!"0x2e\00malloc_heap\00malloc_heap\00\0028\000\001\000\000\00256\000\0028", !1, !5, !6, null, i8* (i32)* @malloc_heap, null, null, !2} ; [ DW_TAG_subprogram ] [line 28] [def] [malloc_heap]
+!5 = !{!"0x29", !1}                               ; [ DW_TAG_file_type ] [/home/user/Documents/carkot/kotstd//home/user/Documents/carkot/kotstd/libc/memory.c]
+!6 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !7, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
+!7 = !{!8, !10}
+!8 = !{!"0xf\00\000\0032\0032\000\000", null, null, !9} ; [ DW_TAG_pointer_type ] [line 0, size 32, align 32, offset 0] [from char]
+!9 = !{!"0x24\00char\000\008\008\000\000\008", null, null} ; [ DW_TAG_base_type ] [char] [line 0, size 8, align 8, offset 0, enc DW_ATE_unsigned_char]
+!10 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]
+!11 = !{!"0x2e\00set_active_heap\00set_active_heap\00\0040\000\001\000\000\00256\000\0040", !1, !5, !12, null, void (i32)* @set_active_heap, null, null, !2} ; [ DW_TAG_subprogram ] [line 40] [def] [set_active_heap]
+!12 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !13, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
+!13 = !{null, !10}
+!14 = !{!"0x2e\00clean_dynamic_heap\00clean_dynamic_heap\00\0046\000\001\000\000\000\000\0046", !1, !5, !15, null, void ()* @clean_dynamic_heap, null, null, !2} ; [ DW_TAG_subprogram ] [line 46] [def] [clean_dynamic_heap]
+!15 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !16, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
+!16 = !{null}
+!17 = !{!18, !22, !24, !25, !26, !27, !31}
+!18 = !{!"0x34\00heaps\00heaps\00\0013\000\001", null, !5, !19, [2 x i8*]* @heaps, null} ; [ DW_TAG_variable ] [heaps] [line 13] [def]
+!19 = !{!"0x1\00\000\0064\0032\000\000\000", null, null, !8, !20, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 64, align 32, offset 0] [from ]
+!20 = !{!21}
+!21 = !{!"0x21\000\002"}                          ; [ DW_TAG_subrange_type ] [0, 1]
+!22 = !{!"0x34\00heap_tails\00heap_tails\00\0018\000\001", null, !5, !23, [2 x i32]* @heap_tails, null} ; [ DW_TAG_variable ] [heap_tails] [line 18] [def]
+!23 = !{!"0x1\00\000\0064\0032\000\000\000", null, null, !10, !20, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 64, align 32, offset 0] [from int]
+!24 = !{!"0x34\00active_heap\00active_heap\00\0019\000\001", null, !5, !10, i32* @active_heap, null} ; [ DW_TAG_variable ] [active_heap] [line 19] [def]
+!25 = !{!"0x34\00dynamic_heap_consume\00dynamic_heap_consume\00\0021\000\001", null, !5, !10, i32* @dynamic_heap_consume, null} ; [ DW_TAG_variable ] [dynamic_heap_consume] [line 21] [def]
+!26 = !{!"0x34\00dynamic_heap_max\00dynamic_heap_max\00\0022\000\001", null, !5, !10, i32* @dynamic_heap_max, null} ; [ DW_TAG_variable ] [dynamic_heap_max] [line 22] [def]
+!27 = !{!"0x34\00static_area\00static_area\00\0010\000\001", null, !5, !28, [30000 x i8]* @static_area, null} ; [ DW_TAG_variable ] [static_area] [line 10] [def]
+!28 = !{!"0x1\00\000\00240000\008\000\000\000", null, null, !9, !29, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 240000, align 8, offset 0] [from char]
+!29 = !{!30}
+!30 = !{!"0x21\000\0030000"}                      ; [ DW_TAG_subrange_type ] [0, 29999]
+!31 = !{!"0x34\00dynamic_area\00dynamic_area\00\0011\000\001", null, !5, !28, [30000 x i8]* @dynamic_area, null} ; [ DW_TAG_variable ] [dynamic_area] [line 11] [def]
+!32 = !{i32 2, !"Dwarf Version", i32 4}
+!33 = !{i32 2, !"Debug Info Version", i32 2}
+!34 = !{i32 1, !"wchar_size", i32 4}
+!35 = !{i32 1, !"min_enum_size", i32 4}
+!36 = !{!"Ubuntu clang version 3.6.2-3ubuntu2 (tags/RELEASE_362/final) (based on LLVM 3.6.2)"}
+!37 = !{!"0x101\00size\0016777244\000", !4, !5, !10} ; [ DW_TAG_arg_variable ] [size] [line 28]
+!38 = !{!"0x102"}                                 ; [ DW_TAG_expression ]
+!39 = !MDLocation(line: 28, column: 23, scope: !4)
+!40 = !{!"0x100\00ptr\0030\000", !4, !5, !8}      ; [ DW_TAG_auto_variable ] [ptr] [line 30]
+!41 = !MDLocation(line: 30, column: 11, scope: !4)
+!42 = !MDLocation(line: 30, column: 23, scope: !4)
+!43 = !MDLocation(line: 30, column: 17, scope: !4)
+!44 = !MDLocation(line: 30, column: 49, scope: !4)
+!45 = !MDLocation(line: 30, column: 38, scope: !4)
+!46 = !MDLocation(line: 31, column: 32, scope: !4)
+!47 = !MDLocation(line: 31, column: 16, scope: !4)
+!48 = !MDLocation(line: 31, column: 5, scope: !4)
+!49 = !MDLocation(line: 33, column: 12, scope: !4)
+!50 = !MDLocation(line: 33, column: 5, scope: !4)
+!51 = !{!"0x101\00heap\0016777256\000", !11, !5, !10} ; [ DW_TAG_arg_variable ] [heap] [line 40]
+!52 = !MDLocation(line: 40, column: 26, scope: !11)
+!53 = !MDLocation(line: 42, column: 19, scope: !11)
+!54 = !MDLocation(line: 42, column: 5, scope: !11)
+!55 = !MDLocation(line: 44, column: 1, scope: !11)
+!56 = !MDLocation(line: 48, column: 29, scope: !14)
+!57 = !MDLocation(line: 48, column: 5, scope: !14)
+!58 = !MDLocation(line: 49, column: 9, scope: !59)
+!59 = !{!"0xb\0049\009\000", !1, !14}             ; [ DW_TAG_lexical_block ] [/home/user/Documents/carkot/kotstd//home/user/Documents/carkot/kotstd/libc/memory.c]
+!60 = !MDLocation(line: 49, column: 36, scope: !59)
+!61 = !MDLocation(line: 49, column: 9, scope: !14)
+!62 = !MDLocation(line: 50, column: 28, scope: !63)
+!63 = !{!"0xb\0049\0054\001", !1, !59}            ; [ DW_TAG_lexical_block ] [/home/user/Documents/carkot/kotstd//home/user/Documents/carkot/kotstd/libc/memory.c]
+!64 = !MDLocation(line: 50, column: 9, scope: !63)
+!65 = !MDLocation(line: 51, column: 5, scope: !63)
+!66 = !MDLocation(line: 53, column: 5, scope: !14)
+!67 = !MDLocation(line: 55, column: 1, scope: !14)
diff --git a/kotstd/libc/memory.c b/kotstd/libc/memory.c
index a493466b285..58e9c18be38 100644
--- a/kotstd/libc/memory.c
+++ b/kotstd/libc/memory.c
@@ -18,6 +18,9 @@ char* heaps[2] = {
 int heap_tails[2] = {0, 0};
 int active_heap = STATIC_HEAP;
 
+int dynamic_heap_consume = 0;
+int dynamic_heap_max = 0;
+
 #else
 char* malloc(int);
 #endif
@@ -42,6 +45,11 @@ void set_active_heap(int heap) {
 
 void clean_dynamic_heap() {
 #ifdef ARM
+    dynamic_heap_consume += heap_tails[DYNAMIC_HEAP];
+    if (heap_tails[DYNAMIC_HEAP] > dynamic_heap_max) {
+        dynamic_heap_max = heap_tails[DYNAMIC_HEAP];
+    }
+
     heap_tails[DYNAMIC_HEAP] = 0;
 #endif
 }
diff --git a/translator/.gradle/2.9/taskArtifacts/cache.properties.lock b/translator/.gradle/2.9/taskArtifacts/cache.properties.lock
index ddeb6230481b469875d25b9be2b78df0399c66fd..4300b030322679d5f65feb3688249c47c291239a 100644
GIT binary patch
literal 17
VcmZSnTh{Pwzt;N`3}7Ho4**4L1`GfI

literal 17
VcmZSnTh{Pwzt;N`3}7H20RTk=1*HH0

diff --git a/translator/.gradle/2.9/taskArtifacts/fileHashes.bin b/translator/.gradle/2.9/taskArtifacts/fileHashes.bin
index 32b16dad9f8f9e5b70e7fc8c11bdfeea522f911b..e7dcec51f193caefa8a5330437cc06aa09ce3143 100644
GIT binary patch
delta 1528
zcmcb*nCa?brVW9f+*@;JFo1#L+Q|>S#3mPcN-zV(Cii;gfayP;CI~g`6DBLBi%$;n
z@&U^&^fCq0H=(qkcP^OU=#8W&qj9oesKn$O-atK>8zw(YQ<&`T(+p<sPnVzk#^)ng
z&jVjGZlFBGEv)M%2UbhUcUjA%Pxp2Z&rmwI|Fgks1_s8kIdJz1zL>1&Co#FuPZZ%k
zAzzS~!txahu6rJ;ncL&$xm9=XwR}{KqK_sgwn|QZ<R=2Q_@|$|L`D^J`hCd)|F+XF
znWDH1nqe9y8~BGPD+w}m{M-A1IeoJA8*bC~YYitnVe$~y3SOVg=r2BbpFhwgFdwj$
zfkW!6zYju;-Dh&3w}e7lLQdwbI}=`>k@IwOFqw1=Vi-)L+}z0*>%=Fo%MzWuA;1#s
z!Z!iH;DpJuc>tqHVzP6fC^!hC1A);54AxVDNWsS>1$IzRfd~sIye3-(nSd1)24#ck
z`$0&G*$zxTSST^sA{ZDPK!f~)`xIWB`I+*keYt_)4)a6O$2YD)@h+nr7ua->5TFZy
zhU<jf0@0f}LpQL1!s>oTopGA{&NZx_8i(drawI@Bt1p0r70*Gi=9UbR&FoQ3j0&5N
z6ok9QNWTBBDi>g!cNVA$6vr^t>=NKOwl5Kx92#u_wr)bSEXbBqt2h^xqzK4)9`!qX
ztUmoanm!e<EzhIBFmF{qv-w_3E~7$=+PNyT18ry3bdP*<K5`-oRmW2cuuaWztzcWY
z<B@`#DG40pN%4>%uZlNCL<jq8aIU!!56m^d(0dJ%gXJg=7I0KLB|!8=B_M@*J}X#m
z6G#pic&8HbSV0DCwodDY<iC@3@(KmdesmY-e~M}-5n6dV_fQeU$uQ%^dO%i#0%N&%
z-`@ScD(|+J|GKSoQm+zKoowr5$9i3`^9t)t!QNX5r61NKWmL)EV6T`pKpYU*(5s{<
zApPK3&9=xxOPSx>&YHCNeHv=0aSOqm(0lw3pTA6<k-b4*S7035K~#18z2MLdYy|pN
z{mkUdMsRxEyr6L^3nI8!HiLsCybT;Alk?k<f|C6X$fC_h+vc(%G^nJ3HMI0XG|cIh
z13H++#<P@PXm4fxc2T*_6O4|dhK1N}pg9tgzd*I{^dUtFcQe?LseQhP=;dJni@i<|
znf$V^5FB=I`@jis`F=IYPHD#3v)P~AE|~lTSa5+7Ze;){nKQ;*cm~$DwI65}EWX&Z
zz+$QsAkMX&fb72mV6RMp%B`88sPII!r{GoiOs~5(Z_Q7NC~ZLvQGs@lVG8X(8qaH4
eT)Fu7{nW_*x_9qT6>+P9ZM2;TDSCS*dIA98nieDg

delta 1512
zcmcb*nCa?brVW9f+zVJ07{EYr?c|4EVv~zJC76L?lY2dL!1Nza6NDP}36mAm#U}@O
z`GDmXdYOXhn^0QNI~UAv^hVN?(KuN!RATZCZ=fDVi^&hu6ehd-G=tgu)8!|>@%aeW
z^T5{(EGFrvpwPsU(OzdbX-z!qm+E_-{=y6ljA3)&4i#jXtmr2(xzJA(;V>azkeI@%
zZ_N+VS7h{?ui5nG?6qGJ5RHr$5Fd(~PEKr<oczd71Z?9^KY0n2SBW~o_U^9!cepE6
z54vi=G)y+|4^dJS2wyuf^`N2O@pvmfr9YB0HljL2;0xGi`}~0pf!V=U1`eUG{yqpX
zcAv=`eZ>_R6P(?H?oL%*9?&2cH1nt!%r1!IWcLAsUt;pQEYZmu0xZD}d=mf+M!3Nq
zV0q_2QE)It2Lhu97@Vg9%@Assq$V@^i%;$;5McoY*JP_86R@JfplmRGKL|-N+kwdk
z3neC71Or0@Xpnz!pTdK*noU2s=7;qzetNEW-`Q6v-er{82sT|L1n2^w;W{C=K=fwL
z&<!lWpbDAy^}Mdvyk~1JsGV{1WStDsJDFEE6XH7_CvZ@;WQc5Lk78m}SS{^)S0^)X
z@0=5R9x?q2oeff5$75{{QO%YKj$!)}k;$Ra7GT>ZM9Ts#DgLYPJ-LM8{fD4PE$gQ*
zTA<pjq1uYUmOPLC!aSdkZ}YvFTt<ao-uri7D7qgYymg{;-j=KXKsshtm>WTKJmvyh
z)Ew6ewuCz#DZrVMzyY2V4+-$9cvD0`v%d!Cl?(B}yaEin*C07qKH^}Re6db^vQq*?
zUsM88nCG*C<u-xjfI)XEA&(Vgz-H^TZb+^>StqX`o_Thjv`28@1?yn7r!765ASWYI
zzvwEE)yhhO49CP~Dll4>9cvBKKXpq-ekZCrnPrn5>vh4-E37vKdv7I_epru`JtcpG
zy<*k?aX?^0FUah6HreAhg!>dy%%?FXM~kio2b)04T1c>Q#ZMNjm6Shje!P9+%J$Zz
z<-hkO^B98E^wm_nhN$7Y2M*f6Mp5SZHwq_bHiDDl<^_#YSrB2xvKbs6;cejXn4I5+
z6prk7Kn~k{v~4aMLW4>gSVK!MM8lk3Igo2FpHVEm{F-Z9-VXWRJ&o;;QA0xX7Ff?0
zkRD)U@$?}@2zN8sm8pHch{)xElrOInL?*xND+Gt!+dg>(i6DW)Ek>2kZZ9j|=-j^H
zI>Zuz8zAp8#+*L{4#rLW0SL#kX@Lz_od9vH?F3}s9RNFO3RG^*1Vx1_lS=M1=hd%`
z<`!H1LMHwf$O2%VfF^GK8<QtCNXW}s=ueoMJBKfR70=d-FTrKVOeQ&hXuK4H9bq-m
KAMDefiJkzXL&{_T

diff --git a/translator/.gradle/2.9/taskArtifacts/fileSnapshots.bin b/translator/.gradle/2.9/taskArtifacts/fileSnapshots.bin
index 53d42c290f939b7ae71b9afbd98589fa3e7fbf94..200df750c66f9f10c7186fa1e50db0fc627a8476 100644
GIT binary patch
delta 1162
zcmX>%Rp`lEp$Vdr91I}9eAgXFN`Tpni3=GR#NSQS(~>&?WXUW8i!#-mU|>+41ZFdr
z<}xrC%-UFXN_=vJM1?@F_R?lmp<@%E+B+wokZ2ItJ85@u=-!pl5FKu^lN}^CPUe&n
zpKKv@kbkDtKJRFjV_-Rkn(WCO(lZ3q3;xwl{LS$dEXdMzZt@Iig~=DBCrqx8k>vLl
zI+0j)-V~ytE_ZT=Ool*Fmc|Eb!GBjFHi(_s{6a=2L16iQHOWqC#@VykpWH5({A5G3
zN^QGJE#r2TTBZ#%+0?ih7}U787bdctVH6Z#vGFYB7us7{zg<*r^8};glNI-*PkyjT
zaC(CW^StdId@OI7r}OwSUl3UC-M4qYugbga<-cw#oz$zGyl`9Y_W7AC8H_@L3~dQH
znYZptczH(7)6KzT(y{4|cbFzj6Jxouy(Wj{D@aAhzr7!r(<fWM;Wll*)^Ngea^um6
z?GGebjx%mAY-6ru6nJswXUd=U<pzQ~%nwN)-?(P_!*-^K?FAkzQq0@ul(OWo2oyZ~
z(OsPXDXO7FXyxhLLq*dI4>QGXFZju<z&Kq)gQZnq`HBVCJrC8)?Q!$ms=N1EK3Ku@
z36q(pZeOp-63)84J&k!W<9117mNQHO8CA^b_azJb+fKh^isCY8p59o&5<9)1m{~?*
zL6@~m`gCsx@eHMN`#&4Jh6K5q<n~5pmVDOjF;2`UnK`677#O5Fn9QedJiz>NyFmog
zTqdA5?`PB*r^)YJ!|JJVXnrL}!gRwl#?a{o@{C;D&+lg3&$#_h4AXx`!Oces!rfvd
z-+xz?3oy<*yWsI;#l(>93GqzXps+f%igQs(ih!KwQNP2->eIhZpUA?fIjx!T>h@cS
zOg~rzTGY-}nH^|5tEPM8oAZ$qQPUfJ7@N1JrZdTboY4NG@w}GBm5YDhPmS!ad-rZ~
zV4vo60b54v=>ohgT+<c&8Ce9RA3Uqs7I|nX^LyJ_lNP^E+pbv52#kq)*-RUl1fHn&
z6ub(b>2=rUt@%k2r7hbhGP9U5Zr^i*IhRqO_xK+^f0;TXdxO5Nz&N&p(*p~c8X2c;
z-#D513~M_ufPsO`;;zDX#+ZRY2bi;TfPtsOu)Us(Wg!z0sm+L$jD)sLjHR3zPa2!T
YOel4wF>W`|W45O_jhXR~p00HG08s3{0RR91

delta 355
zcmaFzR_NSRp$Vdr><l2lnAiy<CBSTknrsFJCZ>scT5@i(3=H}KU{PkVGeCAAL<K_@
z1A}h##<El563vryK6kBmbcHB7u<$<=Om>i{n0x_<6C_vi`+6q27%!56s42~zB&8s5
z`L}$)+^I7fAqLjvPL_~5$v;KpS=*bp!C*0_niG>hNX?kMKw3gTFXi<CW8=+Jz!Hp!
z3ny=oo*|IDHsXC9+k|HjQ}4P@c92n=TqzU3`Gbr~g1|bZjTYH+Sr+v@UT3Oh-`3Ww
zQroUl%eY;omTALG4()0N2JLF5km-$FER(kLmodkP3OFUM6F#4J|CPP+(#p0=Q*$Oa
x9&OzI{xdV9==K;V=9A3ZFVrw~3S(6^9jNT;_76TR%>wPyvzfO~&t@@~2LPtwd=>xz

diff --git a/translator/.gradle/2.9/taskArtifacts/taskArtifacts.bin b/translator/.gradle/2.9/taskArtifacts/taskArtifacts.bin
index c292e099a9686fc93bd108500ebed2309f56ed26..71cb1a261af6a75ab0bb6124c51adfd9cd6e2667 100644
GIT binary patch
delta 95
zcmV-l0HFV>%K@s(0kFJU7*~oTc$zX^?a>d65zfd@0fVNiBtTMn){{$1xwE`lq5+dH
zT^AW90Q+SuoBGL~Q6#Duh1MnW+wPLt()(1blaN#ulPgaNlYL!SvqoJW0kiX7w+2Vh
BEG_^5

delta 95
zcmV-l0HFV>%K@s(0kFJUvyEG#0T^IzW4zd2yIW&~HB6#giIQn2J{Hz6T$YndOTUvf
zT@ka@T^<1$_h}YXiI))UVBFd9Q0)upIgcRfxx!44tdo#b6_YDZ36p(YShMq9w+1q?
BEAs#V