X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Util.xs;h=28fe705bec7846296a88232e785bf2ced3e5b4a2;hb=211d8afaf70e69f82b7113772af03691daf96bf2;hp=013bea280d069f0caf3f4c6bdeff44a086a48e30;hpb=607607c4f5ec537ba56acb4edc424bc71900517a;p=perl%2Fmodules%2FScalar-Vec-Util.git

diff --git a/Util.xs b/Util.xs
index 013bea2..28fe705 100644
--- a/Util.xs
+++ b/Util.xs
@@ -11,31 +11,56 @@
 
 #include "bitvect.h"
 
-STATIC void svu_validate_uv(pTHX_ SV *sv, size_t *offset, const char *desc) {
-#define svu_validate_uv(S, O, D) svu_validate_uv(aTHX_ (S), (O), (D))
+STATIC size_t svu_validate_uv(pTHX_ SV *sv, const char *desc) {
+#define svu_validate_uv(S, D) svu_validate_uv(aTHX_ (S), (D))
  IV i;
 
  if (SvOK(sv) && SvIOK(sv)) {
   if (SvIsUV(sv))
-   *offset = SvUVX(sv);
+   return SvUVX(sv);
   else {
    i = SvIVX(sv);
-   if (i < 0)
-    goto fail;
-   *offset = i;
+   if (i >= 0)
+    return i;
   }
  } else {
   i = SvIV(sv);
-  if (i < 0)
-   goto fail;
-  *offset = i;
+  if (i >= 0)
+   return i;
  }
 
- return;
-
-fail:
- *offset = 0;
  croak("Invalid negative %s", desc ? desc : "integer");
+ return 0;
+}
+
+STATIC char *svu_prepare_sv(pTHX_ SV *sv, size_t s, size_t l) {
+#define svu_prepare_sv(S, I, L) svu_prepare_sv(aTHX_ (S), (I), (L))
+ STRLEN  c;
+ size_t  n = s + l, i, j1, j2, k, z;
+ char   *p;
+
+ SvUPGRADE(sv, SVt_PV);
+
+ p = SvGROW(sv, BV_SIZE(n));
+ c = SvCUR(sv);
+
+ j1 = (s / BITS(BV_UNIT)) * sizeof(BV_UNIT);
+ k  = j1 + sizeof(BV_UNIT);
+ for (i = c < j1 ? j1 : c; i < k; ++i)
+  p[i] = 0;
+
+ j2 = ((s + l - 1) / BITS(BV_UNIT)) * sizeof(BV_UNIT);
+ if (j2 > j1) {
+  k = j2 + sizeof(BV_UNIT);
+  for (i = c < j2 ? j2 : c; i < k; ++i)
+   p[i] = 0;
+ }
+
+ z = 1 + ((s + l - 1) / CHAR_BIT);
+ if (c < z)
+  SvCUR_set(sv, z);
+
+ return p;
 }
 
 /* --- XS ------------------------------------------------------------------ */
@@ -55,26 +80,15 @@ void
 vfill(SV *sv, SV *ss, SV *sl, SV *sf)
 PROTOTYPE: $$$$
 PREINIT:
- size_t s, l, n, o;
+ size_t s, l;
  char f, *v;
 CODE:
- svu_validate_uv(sl, &l, "length");
+ l = svu_validate_uv(sl, "length");
  if (!l)
   XSRETURN(0);
- svu_validate_uv(ss, &s, "offset");
+ s = svu_validate_uv(ss, "offset");
+ v = svu_prepare_sv(sv, s, l);
  f = SvTRUE(sf);
- SvUPGRADE(sv, SVt_PV);
-
- n = BV_SIZE(s + l);
- o = SvLEN(sv);
- if (n > o) {
-  v = SvGROW(sv, n);
-  Zero(v + o, n - o, char);
- } else {
-  v = SvPVX(sv);
- }
- if (SvCUR(sv) < n)
-  SvCUR_set(sv, n);
 
  bv_fill(v, s, l, f);
 
@@ -84,34 +98,22 @@ void
 vcopy(SV *sf, SV *sfs, SV *st, SV *sts, SV *sl)
 PROTOTYPE: $$$$$
 PREINIT:
- size_t fs, ts, l, lf = 0, n, o;
+ size_t fs, ts, l, lf = 0, c;
  char *t, *f;
 CODE:
- svu_validate_uv(sl, &l, "length");
+ l = svu_validate_uv(sl, "length");
  if (!l)
   XSRETURN(0);
- svu_validate_uv(sfs, &fs, "offset");
- svu_validate_uv(sts, &ts, "offset");
- SvUPGRADE(sf, SVt_PV);
- SvUPGRADE(st, SVt_PV);
+ fs = svu_validate_uv(sfs, "offset");
+ ts = svu_validate_uv(sts, "offset");
 
- n  = BV_SIZE(ts + l);
- o  = SvLEN(st);
- if (n > o) {
-  t = SvGROW(st, n);
-  Zero(t + o, n - o, char);
- } else {
-  t = SvPVX(st);
- }
- if (SvCUR(st) < n)
-  SvCUR_set(st, n);
- f = SvPVX(sf); /* We do it there in case st == sf. */
+ t = svu_prepare_sv(st, ts, l);
 
- n  = BV_SIZE(fs + l);
- o  = SvLEN(sf);
- if (n > o) {
-  lf = fs + l - o * CHAR_BIT;
-  l  = o * CHAR_BIT - fs;
+ f = SvPVX(sf); /* We do it there in case st == sf. */
+ c = SvCUR(sf);
+ if (c * CHAR_BIT <= fs + l && c <= SvCUR(st)) {
+  lf = fs + l - c * CHAR_BIT;
+  l  = c * CHAR_BIT - fs;
  }
 
  if (f == t) {
@@ -133,11 +135,11 @@ PREINIT:
  size_t s1, s2, l, o, n;
  char *v1, *v2;
 CODE:
- svu_validate_uv(sl, &l, "length");
+ l = svu_validate_uv(sl, "length");
  if (!l)
   XSRETURN_YES;
- svu_validate_uv(ss1, &s1, "offset");
- svu_validate_uv(ss2, &s2, "offset");
+ s1 = svu_validate_uv(ss1, "offset");
+ s2 = svu_validate_uv(ss2, "offset");
  SvUPGRADE(sv1, SVt_PV);
  SvUPGRADE(sv2, SVt_PV);