Merge pull request #6381 from johnhyde/i/6380/fix-sane-memory-usage

hoon: make sane memory-efficient for large atoms
urbit · Mar 13, 2023 · 8e3ca9b · 8e3ca9b
2 parents 68268c9 + aa6d6b1
commit 8e3ca9b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/bin/solid.pill b/bin/solid.pill
diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon
@@ -4217,12 +4217,19 @@
         $(inx +(inx))
     ==
   |-  ^-  ?
-  ?:  =(0 b)  &
-  =+  cur=(end 3 b)
+  ?:  =(inx len)  &
+  =+  cur=(cut 3 [inx 1] b)
   ?:  &((lth cur 32) !=(10 cur))  |
-  =+  len=(teff cur)
-  ?&  |(=(1 len) =+(i=1 |-(|(=(i len) &((gte (cut 3 [i 1] b) 128) $(i +(i)))))))
-      $(b (rsh [3 len] b))
+  =+  tef=(teff cur)
+  ?&  ?|  =(1 tef)
+          =+  i=1
+          |-  ^-  ?
+          ?|
+              =(i tef)
+              ?&  (gte (cut 3 [(add i inx) 1] b) 128)
+                  $(i +(i))
+      ==  ==  ==
+      $(inx +(inx))
   ==
 ::
 ++  ruth                                                ::  biblical sanity