backport "Few minor C++ fixes" not at all

* backport 344ef13bc0 * we are using irrlilch 1.8 so https://irrlicht.sourceforge.io/docu/classirr_1_1video_1_1_i_video_driver.html#a8c02ee280bb738cdf38b77e7a798244e * do not remove the IrrlichtDevice due backguard compatibilty
Add porting::getTotalSystemMemory() function
2024-06-02 00:20:41 -04:00 · 2024-06-02 00:10:16 -04:00 · 2024-06-01 23:43:02 -04:00 · 2024-06-01 23:38:12 -04:00
14 changed files with 192 additions and 128 deletions
--- a/Android/app/src/main/java/com/multicraft/game/GameActivity.kt
+++ b/Android/app/src/main/java/com/multicraft/game/GameActivity.kt
@ -52,7 +52,6 @@ class GameActivity : SDLActivity() {
 		external fun keyboardEvent(keyboard: Boolean)
 	}

-	private var messageReturnCode = -1
 	private var messageReturnValue = ""
 	private var hasKeyboard = false

@ -106,8 +105,8 @@ class GameActivity : SDLActivity() {

 	@Suppress("unused")
 	fun showDialog(hint: String?, current: String?, editType: Int) {
+		isInputActive = true
 		messageReturnValue = ""
-		messageReturnCode = -1
 		if (editType == 1)
 			runOnUiThread { showMultiLineDialog(hint, current) }
 		else
@ -115,7 +114,6 @@ class GameActivity : SDLActivity() {
 	}

 	private fun showSingleDialog(hint: String?, current: String?, editType: Int) {
-		isInputActive = true
 		val builder = AlertDialog.Builder(this, R.style.FullScreenDialogStyle)
 		val binding = InputTextBinding.inflate(layoutInflater)
 		var hintText: String = hint?.ifEmpty {
@ -143,7 +141,6 @@ class GameActivity : SDLActivity() {
 			if (KeyCode == KeyEvent.KEYCODE_ENTER || KeyCode == KeyEvent.KEYCODE_ENDCALL) {
 				imm.hideSoftInputFromWindow(editText.windowToken, 0)
 				messageReturnValue = editText.text.toString()
-				messageReturnCode = 0
 				alertDialog.dismiss()
 				isInputActive = false
 				return@setOnEditorActionListener true
@ -155,7 +152,6 @@ class GameActivity : SDLActivity() {
 			if (KeyCode == KeyEvent.KEYCODE_ENTER || KeyCode == KeyEvent.KEYCODE_ENDCALL) {
 				imm.hideSoftInputFromWindow(editText.windowToken, 0)
 				messageReturnValue = editText.text.toString()
-				messageReturnCode = 0
 				alertDialog.dismiss()
 				isInputActive = false
 				return@setOnKeyListener true
@ -165,14 +161,12 @@ class GameActivity : SDLActivity() {
 		binding.input.setEndIconOnClickListener {
 			imm.hideSoftInputFromWindow(editText.windowToken, 0)
 			messageReturnValue = editText.text.toString()
-			messageReturnCode = 0
 			alertDialog.dismiss()
 			isInputActive = false
 		}
 		binding.rl.setOnClickListener {
 			window.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN)
 			messageReturnValue = current.toString()
-			messageReturnCode = 0
 			alertDialog.dismiss()
 			isInputActive = false
 		}
@ -185,13 +179,11 @@ class GameActivity : SDLActivity() {
 		alertDialog.setOnCancelListener {
 			window.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN)
 			messageReturnValue = current.toString()
-			messageReturnCode = 0
 			isInputActive = false
 		}
 	}

 	private fun showMultiLineDialog(hint: String?, current: String?) {
-		isInputActive = true
 		val builder = AlertDialog.Builder(this, R.style.FullScreenDialogStyle)
 		val binding = MultilineInputBinding.inflate(layoutInflater)
 		var hintText: String = hint?.ifEmpty {
@ -212,7 +204,6 @@ class GameActivity : SDLActivity() {
 			if (KeyCode == KeyEvent.KEYCODE_ENTER || KeyCode == KeyEvent.KEYCODE_ENDCALL) {
 				imm.hideSoftInputFromWindow(editText.windowToken, 0)
 				messageReturnValue = editText.text.toString()
-				messageReturnCode = 0
 				alertDialog.dismiss()
 				isInputActive = false
 				return@setOnEditorActionListener true
@ -224,7 +215,6 @@ class GameActivity : SDLActivity() {
 			if (KeyCode == KeyEvent.KEYCODE_ENTER || KeyCode == KeyEvent.KEYCODE_ENDCALL) {
 				imm.hideSoftInputFromWindow(editText.windowToken, 0)
 				messageReturnValue = editText.text.toString()
-				messageReturnCode = 0
 				alertDialog.dismiss()
 				isInputActive = false
 				return@setOnKeyListener true
@ -234,14 +224,12 @@ class GameActivity : SDLActivity() {
 		binding.multiInput.setEndIconOnClickListener {
 			imm.hideSoftInputFromWindow(editText.windowToken, 0)
 			messageReturnValue = editText.text.toString()
-			messageReturnCode = 0
 			alertDialog.dismiss()
 			isInputActive = false
 		}
 		binding.multiRl.setOnClickListener {
 			window.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN)
 			messageReturnValue = current.toString()
-			messageReturnCode = -1
 			alertDialog.dismiss()
 			isInputActive = false
 		}
@ -254,7 +242,6 @@ class GameActivity : SDLActivity() {
 		alertDialog.setOnCancelListener {
 			window.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN)
 			messageReturnValue = current.toString()
-			messageReturnCode = -1
 			isInputActive = false
 		}
 	}
@ -262,13 +249,11 @@ class GameActivity : SDLActivity() {
 	@Suppress("unused")
 	fun isDialogActive() = isInputActive

-	@Suppress("unused")
-	fun getDialogState() = messageReturnCode
-
 	@Suppress("unused")
 	fun getDialogValue(): String {
-		messageReturnCode = -1
-		return messageReturnValue
+		val value = messageReturnValue
+		messageReturnValue = ""
+		return value
 	}

 	@Suppress("unused")
--- a/lib/gmp/mini-gmp.c
+++ b/lib/gmp/mini-gmp.c
@ -1,8 +1,9 @@
 /* mini-gmp, a minimalistic implementation of a GNU GMP subset.

   Contributed to the GNU project by Niels Möller
+   Additional functionalities and improvements by Marco Bodrato.

-Copyright 1991-1997, 1999-2019 Free Software Foundation, Inc.
+Copyright 1991-1997, 1999-2022 Free Software Foundation, Inc.

 This file is part of the GNU MP Library.

@ -21,7 +22,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */

 /* NOTE: All functions in this file which are not declared in
   mini-gmp.h are internal, and are not intended to be compatible
-   neither with GMP nor with future versions of mini-gmp. */
+   with GMP or with future versions of mini-gmp. */

 /* Much of the material copied from GMP files, including: gmp-impl.h,
   longlong.h, mpn/generic/add_n.c, mpn/generic/addmul_1.c,
@ -79,6 +80,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #define gmp_assert_nocarry(x) do { \
    mp_limb_t __cy = (x);	   \
    assert (__cy == 0);		   \
+    (void) (__cy);		   \
  } while (0)

 #define gmp_clz(count, x) do {						\
@ -137,6 +139,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
      mp_limb_t __x0, __x1, __x2, __x3;					\
      unsigned __ul, __vl, __uh, __vh;					\
      mp_limb_t __u = (u), __v = (v);					\
+      assert (sizeof (unsigned) * 2 >= sizeof (mp_limb_t));		\
 									\
      __ul = __u & GMP_LLIMB_MASK;					\
      __uh = __u >> (GMP_LIMB_BITS / 2);				\
@ -158,12 +161,19 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
    }									\
  } while (0)

+/* If mp_limb_t is of size smaller than int, plain u*v implies
+   automatic promotion to *signed* int, and then multiply may overflow
+   and cause undefined behavior. Explicitly cast to unsigned int for
+   that case. */
+#define gmp_umullo_limb(u, v) \
+  ((sizeof(mp_limb_t) >= sizeof(int)) ? (u)*(v) : (unsigned int)(u) * (v))
+
 #define gmp_udiv_qrnnd_preinv(q, r, nh, nl, d, di)			\
  do {									\
    mp_limb_t _qh, _ql, _r, _mask;					\
    gmp_umul_ppmm (_qh, _ql, (nh), (di));				\
    gmp_add_ssaaaa (_qh, _ql, _qh, _ql, (nh) + 1, (nl));		\
-    _r = (nl) - _qh * (d);						\
+    _r = (nl) - gmp_umullo_limb (_qh, (d));				\
    _mask = -(mp_limb_t) (_r > _ql); /* both > and >= are OK */		\
    _qh += _mask;							\
    _r += _mask & (d);							\
@ -184,7 +194,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
    gmp_add_ssaaaa ((q), _q0, (q), _q0, (n2), (n1));			\
 									\
    /* Compute the two most significant limbs of n - q'd */		\
-    (r1) = (n1) - (d1) * (q);						\
+    (r1) = (n1) - gmp_umullo_limb ((d1), (q));				\
    gmp_sub_ddmmss ((r1), (r0), (r1), (n0), (d1), (d0));		\
    gmp_umul_ppmm (_t1, _t0, (d0), (q));				\
    gmp_sub_ddmmss ((r1), (r0), (r1), (r0), _t1, _t0);			\
@ -340,20 +350,27 @@ mp_set_memory_functions (void *(*alloc_func) (size_t),
  gmp_free_func = free_func;
 }

-#define gmp_xalloc(size) ((*gmp_allocate_func)((size)))
-#define gmp_free(p) ((*gmp_free_func) ((p), 0))
+#define gmp_alloc(size) ((*gmp_allocate_func)((size)))
+#define gmp_free(p, size) ((*gmp_free_func) ((p), (size)))
+#define gmp_realloc(ptr, old_size, size) ((*gmp_reallocate_func)(ptr, old_size, size))

 static mp_ptr
-gmp_xalloc_limbs (mp_size_t size)
+gmp_alloc_limbs (mp_size_t size)
 {
-  return (mp_ptr) gmp_xalloc (size * sizeof (mp_limb_t));
+  return (mp_ptr) gmp_alloc (size * sizeof (mp_limb_t));
 }

 static mp_ptr
-gmp_xrealloc_limbs (mp_ptr old, mp_size_t size)
+gmp_realloc_limbs (mp_ptr old, mp_size_t old_size, mp_size_t size)
 {
  assert (size > 0);
-  return (mp_ptr) (*gmp_reallocate_func) (old, 0, size * sizeof (mp_limb_t));
+  return (mp_ptr) gmp_realloc (old, old_size * sizeof (mp_limb_t), size * sizeof (mp_limb_t));
+}
+
+static void
+gmp_free_limbs (mp_ptr old, mp_size_t size)
+{
+  gmp_free (old, size * sizeof (mp_limb_t));
 }


@ -765,6 +782,7 @@ mpn_invert_3by2 (mp_limb_t u1, mp_limb_t u0)
    mp_limb_t p, ql;
    unsigned ul, uh, qh;

+    assert (sizeof (unsigned) * 2 >= sizeof (mp_limb_t));
    /* For notation, let b denote the half-limb base, so that B = b^2.
       Split u1 = b uh + ul. */
    ul = u1 & GMP_LLIMB_MASK;
@ -945,11 +963,17 @@ mpn_div_qr_1_preinv (mp_ptr qp, mp_srcptr np, mp_size_t nn,
  mp_limb_t d, di;
  mp_limb_t r;
  mp_ptr tp = NULL;
+  mp_size_t tn = 0;

  if (inv->shift > 0)
    {
      /* Shift, reusing qp area if possible. In-place shift if qp == np. */
-      tp = qp ? qp : gmp_xalloc_limbs (nn);
+      tp = qp;
+      if (!tp)
+        {
+	   tn = nn;
+	   tp = gmp_alloc_limbs (tn);
+        }
      r = mpn_lshift (tp, np, nn, inv->shift);
      np = tp;
    }
@ -966,8 +990,8 @@ mpn_div_qr_1_preinv (mp_ptr qp, mp_srcptr np, mp_size_t nn,
      if (qp)
 	qp[nn] = q;
    }
-  if ((inv->shift > 0) && (tp != qp))
-    gmp_free (tp);
+  if (tn)
+    gmp_free_limbs (tp, tn);

  return r >> inv->shift;
 }
@ -1125,13 +1149,13 @@ mpn_div_qr (mp_ptr qp, mp_ptr np, mp_size_t nn, mp_srcptr dp, mp_size_t dn)
  mpn_div_qr_invert (&inv, dp, dn);
  if (dn > 2 && inv.shift > 0)
    {
-      tp = gmp_xalloc_limbs (dn);
+      tp = gmp_alloc_limbs (dn);
      gmp_assert_nocarry (mpn_lshift (tp, dp, dn, inv.shift));
      dp = tp;
    }
  mpn_div_qr_preinv (qp, np, nn, dp, dn, &inv);
  if (tp)
-    gmp_free (tp);
+    gmp_free_limbs (tp, dn);
 }


@ -1307,28 +1331,25 @@ mpn_set_str_bits (mp_ptr rp, const unsigned char *sp, size_t sn,
 		  unsigned bits)
 {
  mp_size_t rn;
-  size_t j;
+  mp_limb_t limb;
  unsigned shift;

-  for (j = sn, rn = 0, shift = 0; j-- > 0; )
+  for (limb = 0, rn = 0, shift = 0; sn-- > 0; )
    {
-      if (shift == 0)
-	{
-	  rp[rn++] = sp[j];
-	  shift += bits;
-	}
-      else
-	{
-	  rp[rn-1] |= (mp_limb_t) sp[j] << shift;
+      limb |= (mp_limb_t) sp[sn] << shift;
      shift += bits;
      if (shift >= GMP_LIMB_BITS)
 	{
 	  shift -= GMP_LIMB_BITS;
-	      if (shift > 0)
-		rp[rn++] = (mp_limb_t) sp[j] >> (bits - shift);
-	    }
+	  rp[rn++] = limb;
+	  /* Next line is correct also if shift == 0,
+	     bits == 8, and mp_limb_t == unsigned char. */
+	  limb = (unsigned int) sp[sn] >> (bits - shift);
 	}
    }
+  if (limb != 0)
+    rp[rn++] = limb;
+  else
    rn = mpn_normalized_size (rp, rn);
  return rn;
 }
@ -1417,14 +1438,14 @@ mpz_init2 (mpz_t r, mp_bitcnt_t bits)

  r->_mp_alloc = rn;
  r->_mp_size = 0;
-  r->_mp_d = gmp_xalloc_limbs (rn);
+  r->_mp_d = gmp_alloc_limbs (rn);
 }

 void
 mpz_clear (mpz_t r)
 {
  if (r->_mp_alloc)
-    gmp_free (r->_mp_d);
+    gmp_free_limbs (r->_mp_d, r->_mp_alloc);
 }

 static mp_ptr
@ -1433,9 +1454,9 @@ mpz_realloc (mpz_t r, mp_size_t size)
  size = GMP_MAX (size, 1);

  if (r->_mp_alloc)
-    r->_mp_d = gmp_xrealloc_limbs (r->_mp_d, size);
+    r->_mp_d = gmp_realloc_limbs (r->_mp_d, r->_mp_alloc, size);
  else
-    r->_mp_d = gmp_xalloc_limbs (size);
+    r->_mp_d = gmp_alloc_limbs (size);
  r->_mp_alloc = size;

  if (GMP_ABS (r->_mp_size) > size)
@ -1530,8 +1551,7 @@ mpz_init_set (mpz_t r, const mpz_t x)
 int
 mpz_fits_slong_p (const mpz_t u)
 {
-  return (LONG_MAX + LONG_MIN == 0 || mpz_cmp_ui (u, LONG_MAX) <= 0) &&
-    mpz_cmpabs_ui (u, GMP_NEG_CAST (unsigned long int, LONG_MIN)) <= 0;
+  return mpz_cmp_si (u, LONG_MAX) <= 0 && mpz_cmp_si (u, LONG_MIN) >= 0;
 }

 static int
@ -1554,6 +1574,30 @@ mpz_fits_ulong_p (const mpz_t u)
  return us >= 0 && mpn_absfits_ulong_p (u->_mp_d, us);
 }

+int
+mpz_fits_sint_p (const mpz_t u)
+{
+  return mpz_cmp_si (u, INT_MAX) <= 0 && mpz_cmp_si (u, INT_MIN) >= 0;
+}
+
+int
+mpz_fits_uint_p (const mpz_t u)
+{
+  return u->_mp_size >= 0 && mpz_cmpabs_ui (u, UINT_MAX) <= 0;
+}
+
+int
+mpz_fits_sshort_p (const mpz_t u)
+{
+  return mpz_cmp_si (u, SHRT_MAX) <= 0 && mpz_cmp_si (u, SHRT_MIN) >= 0;
+}
+
+int
+mpz_fits_ushort_p (const mpz_t u)
+{
+  return u->_mp_size >= 0 && mpz_cmpabs_ui (u, USHRT_MAX) <= 0;
+}
+
 long int
 mpz_get_si (const mpz_t u)
 {
@ -1891,9 +1935,8 @@ mpz_neg (mpz_t r, const mpz_t u)
 void
 mpz_swap (mpz_t u, mpz_t v)
 {
-  MP_SIZE_T_SWAP (u->_mp_size, v->_mp_size);
  MP_SIZE_T_SWAP (u->_mp_alloc, v->_mp_alloc);
-  MP_PTR_SWAP (u->_mp_d, v->_mp_d);
+  MPN_PTR_SWAP (u->_mp_d, u->_mp_size, v->_mp_d, v->_mp_size);
 }


@ -2676,7 +2719,7 @@ mpz_make_odd (mpz_t r)

  assert (r->_mp_size > 0);
  /* Count trailing zeros, equivalent to mpn_scan1, because we know that there is a 1 */
-  shift = mpn_common_scan (r->_mp_d[0], 0, r->_mp_d, 0, 0);
+  shift = mpn_scan1 (r->_mp_d, 0);
  mpz_tdiv_q_2exp (r, r, shift);

  return shift;
@ -2733,9 +2776,13 @@ mpz_gcd (mpz_t g, const mpz_t u, const mpz_t v)

 	if (tv->_mp_size == 1)
 	  {
-	    mp_limb_t vl = tv->_mp_d[0];
-	    mp_limb_t ul = mpz_tdiv_ui (tu, vl);
-	    mpz_set_ui (g, mpn_gcd_11 (ul, vl));
+	    mp_limb_t *gp;
+
+	    mpz_tdiv_r (tu, tu, tv);
+	    gp = MPZ_REALLOC (g, 1); /* gp = mpz_limbs_modify (g, 1); */
+	    *gp = mpn_gcd_11 (tu->_mp_d[0], tv->_mp_d[0]);
+
+	    g->_mp_size = *gp != 0; /* mpz_limbs_finish (g, 1); */
 	    break;
 	  }
 	mpz_sub (tu, tu, tv);
@ -2824,7 +2871,6 @@ mpz_gcdext (mpz_t g, mpz_t s, mpz_t t, const mpz_t u, const mpz_t v)
   * s0 = 0,    s1 = 2^vz
   */

-  mpz_setbit (t0, uz);
  mpz_tdiv_qr (t1, tu, tu, tv);
  mpz_mul_2exp (t1, t1, uz);

@ -2835,8 +2881,7 @@ mpz_gcdext (mpz_t g, mpz_t s, mpz_t t, const mpz_t u, const mpz_t v)
    {
      mp_bitcnt_t shift;
      shift = mpz_make_odd (tu);
-      mpz_mul_2exp (t0, t0, shift);
-      mpz_mul_2exp (s0, s0, shift);
+      mpz_setbit (t0, uz + shift);
      power += shift;

      for (;;)
@ -2874,6 +2919,8 @@ mpz_gcdext (mpz_t g, mpz_t s, mpz_t t, const mpz_t u, const mpz_t v)
 	  power += shift;
 	}
    }
+  else
+    mpz_setbit (t0, uz);

  /* Now tv = odd part of gcd, and -s0 and t0 are corresponding
     cofactors. */
@ -3048,7 +3095,7 @@ mpz_powm (mpz_t r, const mpz_t b, const mpz_t e, const mpz_t m)

  if (en == 0)
    {
-      mpz_set_ui (r, 1);
+      mpz_set_ui (r, mpz_cmpabs_ui (m, 1));
      return;
    }

@ -3062,7 +3109,7 @@ mpz_powm (mpz_t r, const mpz_t b, const mpz_t e, const mpz_t m)
 	 one, using a *normalized* m. */
      minv.shift = 0;

-      tp = gmp_xalloc_limbs (mn);
+      tp = gmp_alloc_limbs (mn);
      gmp_assert_nocarry (mpn_lshift (tp, mp, mn, shift));
      mp = tp;
    }
@ -3128,7 +3175,7 @@ mpz_powm (mpz_t r, const mpz_t b, const mpz_t e, const mpz_t m)
      tr->_mp_size = mpn_normalized_size (tr->_mp_d, mn);
    }
  if (tp)
-    gmp_free (tp);
+    gmp_free_limbs (tp, mn);

  mpz_swap (r, tr);
  mpz_clear (tr);
@ -3150,6 +3197,7 @@ void
 mpz_rootrem (mpz_t x, mpz_t r, const mpz_t y, unsigned long z)
 {
  int sgn;
+  mp_bitcnt_t bc;
  mpz_t t, u;

  sgn = y->_mp_size < 0;
@ -3168,7 +3216,8 @@ mpz_rootrem (mpz_t x, mpz_t r, const mpz_t y, unsigned long z)

  mpz_init (u);
  mpz_init (t);
-  mpz_setbit (t, mpz_sizeinbase (y, 2) / z + 1);
+  bc = (mpz_sizeinbase (y, 2) - 1) / z + 1;
+  mpz_setbit (t, bc);

  if (z == 2) /* simplify sqrt loop: z-1 == 1 */
    do {
@ -3339,13 +3388,15 @@ gmp_jacobi_coprime (mp_limb_t a, mp_limb_t b)
  gmp_ctz(c, a);
  a >>= 1;

-  do
+  for (;;)
    {
      a >>= c;
      /* (2/b) = -1 if b = 3 or 5 mod 8 */
      bit ^= c & (b ^ (b >> 1));
      if (a < b)
 	{
+	  if (a == 0)
+	    return bit & 1 ? -1 : 1;
 	  bit ^= a & b;
 	  a = b - a;
 	  b -= a;
@ -3359,9 +3410,6 @@ gmp_jacobi_coprime (mp_limb_t a, mp_limb_t b)
      gmp_ctz(c, a);
      ++c;
    }
-  while (b > 0);
-
-  return bit & 1 ? -1 : 1;
 }

 static void
@ -3407,7 +3455,7 @@ gmp_lucas_mod (mpz_t V, mpz_t Qk, long Q,
      gmp_lucas_step_k_2k (V, Qk, n);

      /* A step k->k+1 is performed if the bit in $n$ is 1	*/
-      /* mpz_tstbit(n,bs) or the the bit is 0 in $n$ but	*/
+      /* mpz_tstbit(n,bs) or the bit is 0 in $n$ but	*/
      /* should be 1 in $n+1$ (bs == b0)			*/
      if (b0 == bs || mpz_tstbit (n, bs))
 	{
@ -3476,7 +3524,8 @@ gmp_stronglucas (const mpz_t x, mpz_t Qk)
  mpz_init (V);

  /* n-(D/n) = n+1 = d*2^{b0}, with d = (n>>b0) | 1 */
-  b0 = mpz_scan0 (n, 0);
+  b0 = mpn_common_scan (~ n->_mp_d[0], 0, n->_mp_d, n->_mp_size, GMP_LIMB_MAX);
+  /* b0 = mpz_scan0 (n, 0); */

  /* D= P^2 - 4Q; P = 1; Q = (1-D)/4 */
  Q = (D & 2) ? (long) (D >> 2) + 1 : -(long) (D >> 2);
@ -3508,11 +3557,6 @@ gmp_millerrabin (const mpz_t n, const mpz_t nm1, mpz_t y,
      mpz_powm_ui (y, y, 2, n);
      if (mpz_cmp (y, nm1) == 0)
 	return 1;
-      /* y == 1 means that the previous y was a non-trivial square root
-	 of 1 (mod n). y == 0 means that n is a power of the base.
-	 In either case, n is not prime. */
-      if (mpz_cmp_ui (y, 1) <= 0)
-	return 0;
    }
  return 0;
 }
@ -3558,7 +3602,8 @@ mpz_probab_prime_p (const mpz_t n, int reps)
  /* Find q and k, where q is odd and n = 1 + 2**k * q.  */
  mpz_abs (nm1, n);
  nm1->_mp_d[0] -= 1;
-  k = mpz_scan1 (nm1, 0);
+  /* Count trailing zeros, equivalent to mpn_scan1, because we know that there is a 1 */
+  k = mpn_scan1 (nm1->_mp_d, 0);
  mpz_tdiv_q_2exp (q, nm1, k);

  /* BPSW test */
@ -4133,7 +4178,7 @@ mpz_scan0 (const mpz_t u, mp_bitcnt_t starting_bit)
 size_t
 mpz_sizeinbase (const mpz_t u, int base)
 {
-  mp_size_t un;
+  mp_size_t un, tn;
  mp_srcptr up;
  mp_ptr tp;
  mp_bitcnt_t bits;
@ -4166,20 +4211,21 @@ mpz_sizeinbase (const mpz_t u, int base)
 	 10. */
    }

-  tp = gmp_xalloc_limbs (un);
+  tp = gmp_alloc_limbs (un);
  mpn_copyi (tp, up, un);
  mpn_div_qr_1_invert (&bi, base);

+  tn = un;
  ndigits = 0;
  do
    {
      ndigits++;
-      mpn_div_qr_1_preinv (tp, tp, un, &bi);
-      un -= (tp[un-1] == 0);
+      mpn_div_qr_1_preinv (tp, tp, tn, &bi);
+      tn -= (tp[tn-1] == 0);
    }
-  while (un > 0);
+  while (tn > 0);

-  gmp_free (tp);
+  gmp_free_limbs (tp, un);
  return ndigits;
 }

@ -4189,7 +4235,7 @@ mpz_get_str (char *sp, int base, const mpz_t u)
  unsigned bits;
  const char *digits;
  mp_size_t un;
-  size_t i, sn;
+  size_t i, sn, osn;

  digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
  if (base > 1)
@ -4210,15 +4256,19 @@ mpz_get_str (char *sp, int base, const mpz_t u)

  sn = 1 + mpz_sizeinbase (u, base);
  if (!sp)
-    sp = (char *) gmp_xalloc (1 + sn);
-
+    {
+      osn = 1 + sn;
+      sp = (char *) gmp_alloc (osn);
+    }
+  else
+    osn = 0;
  un = GMP_ABS (u->_mp_size);

  if (un == 0)
    {
      sp[0] = '0';
-      sp[1] = '\0';
-      return sp;
+      sn = 1;
+      goto ret;
    }

  i = 0;
@ -4237,17 +4287,20 @@ mpz_get_str (char *sp, int base, const mpz_t u)
      mp_ptr tp;

      mpn_get_base_info (&info, base);
-      tp = gmp_xalloc_limbs (un);
+      tp = gmp_alloc_limbs (un);
      mpn_copyi (tp, u->_mp_d, un);

      sn = i + mpn_get_str_other ((unsigned char *) sp + i, base, &info, tp, un);
-      gmp_free (tp);
+      gmp_free_limbs (tp, un);
    }

  for (; i < sn; i++)
    sp[i] = digits[(unsigned char) sp[i]];

+ret:
  sp[sn] = '\0';
+  if (osn && osn != sn + 1)
+    sp = (char*) gmp_realloc (sp, osn, sn + 1);
  return sp;
 }

@ -4257,7 +4310,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)
  unsigned bits, value_of_a;
  mp_size_t rn, alloc;
  mp_ptr rp;
-  size_t dn;
+  size_t dn, sn;
  int sign;
  unsigned char *dp;

@ -4295,7 +4348,8 @@ mpz_set_str (mpz_t r, const char *sp, int base)
      r->_mp_size = 0;
      return -1;
    }
-  dp = (unsigned char *) gmp_xalloc (strlen (sp));
+  sn = strlen(sp);
+  dp = (unsigned char *) gmp_alloc (sn);

  value_of_a = (base > 36) ? 36 : 10;
  for (dn = 0; *sp; sp++)
@ -4315,7 +4369,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)

      if (digit >= (unsigned) base)
 	{
-	  gmp_free (dp);
+	  gmp_free (dp, sn);
 	  r->_mp_size = 0;
 	  return -1;
 	}
@ -4325,7 +4379,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)

  if (!dn)
    {
-      gmp_free (dp);
+      gmp_free (dp, sn);
      r->_mp_size = 0;
      return -1;
    }
@ -4349,7 +4403,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)
      rn -= rp[rn-1] == 0;
    }
  assert (rn <= alloc);
-  gmp_free (dp);
+  gmp_free (dp, sn);

  r->_mp_size = sign ? - rn : rn;

@ -4367,13 +4421,15 @@ size_t
 mpz_out_str (FILE *stream, int base, const mpz_t x)
 {
  char *str;
-  size_t len;
+  size_t len, n;

  str = mpz_get_str (NULL, base, x);
+  if (!str)
+    return 0;
  len = strlen (str);
-  len = fwrite (str, 1, len, stream);
-  gmp_free (str);
-  return len;
+  n = fwrite (str, 1, len, stream);
+  gmp_free (str, len + 1);
+  return n;
 }


@ -4462,7 +4518,7 @@ mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
  mp_size_t un;

  if (nails != 0)
-    gmp_die ("mpz_import: Nails not supported.");
+    gmp_die ("mpz_export: Nails not supported.");

  assert (order == 1 || order == -1);
  assert (endian >= -1 && endian <= 1);
@ -4477,7 +4533,7 @@ mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
      ptrdiff_t word_step;
      /* The current (partial) limb. */
      mp_limb_t limb;
-      /* The number of bytes left to to in this limb. */
+      /* The number of bytes left to do in this limb. */
      size_t bytes;
      /* The index where the limb was read. */
      mp_size_t i;
@ -4501,7 +4557,7 @@ mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
      count = (k + (un-1) * sizeof (mp_limb_t) + size - 1) / size;

      if (!r)
-	r = gmp_xalloc (count * size);
+	r = gmp_alloc (count * size);

      if (endian == 0)
 	endian = gmp_detect_endian ();
--- a/lib/gmp/mini-gmp.h
+++ b/lib/gmp/mini-gmp.h
@ -1,6 +1,6 @@
 /* mini-gmp, a minimalistic implementation of a GNU GMP subset.

-Copyright 2011-2015, 2017, 2019 Free Software Foundation, Inc.
+Copyright 2011-2015, 2017, 2019-2021 Free Software Foundation, Inc.

 This file is part of the GNU MP Library.

@ -233,6 +233,10 @@ mp_bitcnt_t mpz_scan1 (const mpz_t, mp_bitcnt_t);

 int mpz_fits_slong_p (const mpz_t);
 int mpz_fits_ulong_p (const mpz_t);
+int mpz_fits_sint_p (const mpz_t);
+int mpz_fits_uint_p (const mpz_t);
+int mpz_fits_sshort_p (const mpz_t);
+int mpz_fits_ushort_p (const mpz_t);
 long int mpz_get_si (const mpz_t);
 unsigned long int mpz_get_ui (const mpz_t);
 double mpz_get_d (const mpz_t);
@ -280,7 +284,9 @@ int mpz_init_set_str (mpz_t, const char *, int);
  || defined (_MSL_STDIO_H)           /* Metrowerks */          \
  || defined (_STDIO_H_INCLUDED)      /* QNX4 */		\
  || defined (_ISO_STDIO_ISO_H)       /* Sun C++ */		\
-  || defined (__STDIO_LOADED)         /* VMS */
+  || defined (__STDIO_LOADED)         /* VMS */			\
+  || defined (_STDIO)                 /* HPE NonStop */         \
+  || defined (__DEFINED_FILE)         /* musl */
 size_t mpz_out_str (FILE *, int, const mpz_t);
 #endif

--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@ -59,9 +59,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "game.h"
 #include "chatmessage.h"
 #include "translation.h"
-#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
-#include <SDL.h>
-#endif

 extern gui::IGUIEnvironment* guienv;

@ -696,10 +693,9 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
 			rfile->drop();
 			return false;
 		}
-
-#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
-		if (SDL_GetSystemRAM() < 2048) {
-			core::dimension2du dimensions = img->getDimension();
+#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 9
+		float memoryMax = porting::getTotalSystemMemory() / 1024;
+		if (memoryMax <= 2) {
 			irr::video::ECOLOR_FORMAT format = img->getColorFormat();
 			irr::video::ECOLOR_FORMAT new_format = irr::video::ECF_UNKNOWN;

@ -723,6 +719,7 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
 			}

 			if (new_format != irr::video::ECF_UNKNOWN) {
+				core::dimension2du dimensions = img->getDimension();
 				irr::video::IImage* converted_img = vdrv->createImage(new_format, dimensions);
 				img->copyTo(converted_img, core::position2d<s32>(0, 0));
 				img->drop();
@ -730,6 +727,7 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
 			}
 		}
 #endif
+
 		m_tsrc->insertSourceImage(filename, img);
 		img->drop();
 		rfile->drop();
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@ -2166,7 +2166,7 @@ void Game::openConsole(float scale, const wchar_t *line)
 void Game::handleTouchChatInput()
 {
 	if (porting::getInputDialogOwner() == "chat" &&
-			porting::getInputDialogState() == 0) {
+			!porting::isInputDialogActive()) {
 		std::string text = porting::getInputDialogValue();
 		client->typeChatMessage(utf8_to_wide(text));
 		if (!text.empty() && gui_chat_console->isOpen()) {
--- a/src/client/guiscalingfilter.cpp
+++ b/src/client/guiscalingfilter.cpp
@ -129,7 +129,7 @@ video::ITexture *guiScalingResizeCached(video::IVideoDriver *driver,
 #endif

 	// Convert the scaled image back into a texture.
-	scaled = driver->addTexture(scalename, destimg, NULL);
+	scaled = driver->addTexture(scalename, destimg, NULL); // irr 1.8
 	destimg->drop();
 	g_txrCache[scalename] = scaled;

--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@ -548,7 +548,7 @@ void set_default_settings()

 	// Set the optimal settings depending on the memory size [Android] | model [iOS]
 #ifdef __ANDROID__
-	float memoryMax = SDL_GetSystemRAM() / 1024;
+	float memoryMax = porting::getTotalSystemMemory() / 1024;

 	if (memoryMax < 2) {
 		// minimal settings for less than 2GB RAM
--- a/src/gui/guiConfirmRegistration.cpp
+++ b/src/gui/guiConfirmRegistration.cpp
@ -317,7 +317,7 @@ bool GUIConfirmRegistration::getTouchUIInput()
 		return false;

 	// still waiting
-	if (porting::getInputDialogState() == -1)
+	if (porting::isInputDialogActive())
 		return true;

 	m_jni_field_name.clear();
--- a/src/gui/guiFormSpecMenu.cpp
+++ b/src/gui/guiFormSpecMenu.cpp
@ -3611,7 +3611,7 @@ bool GUIFormSpecMenu::getTouchUIInput()
 		return false;

 	// still waiting
-	if (porting::getInputDialogState() == -1)
+	if (porting::isInputDialogActive())
 		return true;

 	std::string fieldname = m_jni_field_name;
--- a/src/porting.cpp
+++ b/src/porting.cpp
@ -60,6 +60,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#include <FindDirectory.h>
 #endif

+#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
+	#include <SDL.h>
+#endif
+
 #include "config.h"
 #include "debug.h"
 #include "filesys.h"
@ -749,6 +753,16 @@ std::string getSecretKey(const std::string &key)
 }
 #endif

+float getTotalSystemMemory()
+{
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+	static const float retval = SDL_GetSystemRAM();
+	return retval;
+#else
+	return 0;
+#endif
+}
+
 bool open_directory(const std::string &path)
 {
 	if (!fs::IsDir(path)) {
--- a/src/porting.h
+++ b/src/porting.h
@ -362,6 +362,12 @@ bool open_url(const std::string &url);
 std::string getSecretKey(const std::string &key);
 #endif

+/**
+ * Get total device memory
+ */
+
+float getTotalSystemMemory();
+
 bool open_directory(const std::string &path);

 } // namespace porting
--- a/src/porting_android.cpp
+++ b/src/porting_android.cpp
@ -1,8 +1,8 @@
 /*
 Minetest
 Copyright (C) 2014 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2014-2022 Maksim Gamarnik [MoNTE48] <Maksym48@pm.me>
-Copyright (C) 2022 Dawid Gan <deveee@gmail.com>
+Copyright (C) 2014-2023 Maksim Gamarnik [MoNTE48] <Maksym48@pm.me>
+Copyright (C) 2023 Dawid Gan <deveee@gmail.com>

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
--- a/src/porting_android.h
+++ b/src/porting_android.h
@ -1,8 +1,8 @@
 /*
 Minetest
 Copyright (C) 2014 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2014-2022 Maksim Gamarnik [MoNTE48] <Maksym48@pm.me>
-Copyright (C) 2022 Dawid Gan <deveee@gmail.com>
+Copyright (C) 2014-2023 Maksim Gamarnik [MoNTE48] <Maksym48@pm.me>
+Copyright (C) 2023 Dawid Gan <deveee@gmail.com>

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@ -68,7 +68,6 @@ void openURIAndroid(const std::string &url);
 int getInputDialogState();

 /**
- * WORKAROUND for not working callbacks from java -> c++
 * get text in current input dialog
 */
 std::string getInputDialogValue();
--- a/src/terminal_chat_console.cpp
+++ b/src/terminal_chat_console.cpp
@ -398,7 +398,7 @@ void TerminalChatConsole::step(int ch)
 	minutes = (float)minutes / 1000 * 60;

 	if (m_game_time)
-		printw(" | Game %d Time of day %02d:%02d ",
+		printw(" | Game %ld Time of day %02d:%02d ",
 			m_game_time, hours, minutes);

 	// draw text
Author	SHA1	Message	Date
mckaygerhard	5ee92bc1ee	backport "Few minor C++ fixes" not at all * backport `344ef13bc0` * we are using irrlilch 1.8 so https://irrlicht.sourceforge.io/docu/classirr_1_1video_1_1_i_video_driver.html#a8c02ee280bb738cdf38b77e7a798244e * do not remove the IrrlichtDevice due backguard compatibilty	2024-06-02 00:20:41 -04:00
mckaygerhard	1f161e2217	Add `porting::getTotalSystemMemory()` function * becouse Convert textures to (A1)R5G6B5 format on low memory device tune up the commit 03737c4e9baeae7087ff986cbb901c64d312e8a6 * backported from `3bb240919a`	2024-06-02 00:10:16 -04:00
mckaygerhard	284a473584	Android: get rid of `getInputDialogState` * backported `b7c470ae92` * let workaround of getInputDialogState	2024-06-01 23:43:02 -04:00
Maksym H	e21a1a6e62	Update mini-gmp	2024-06-01 23:38:12 -04:00