Merge pull request #17 from camillobruni/2024-11-26_safe_add

kmiller68 · web-flow · commit c1a122d6d696 · 2025-01-16T09:16:26.000-05:00
Use simpler safe_add
diff --git a/SunSpider/crypto-md5.js b/SunSpider/crypto-md5.js
@@ -181,9 +181,7 @@ function core_hmac_md5(key, data)
  */
 function safe_add(x, y)
 {
-  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
-  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-  return (msw << 16) | (lsw & 0xFFFF);
+  return ((x & 0xffffffff) + (y & 0xffffffff)) & 0xffffffff
 }
 
 /*
diff --git a/SunSpider/crypto-sha1.js b/SunSpider/crypto-sha1.js
@@ -127,9 +127,7 @@ function core_hmac_sha1(key, data)
  */
 function safe_add(x, y)
 {
-  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
-  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-  return (msw << 16) | (lsw & 0xFFFF);
+  return ((x & 0xffffffff) + (y & 0xffffffff)) & 0xffffffff
 }
 
 /*
diff --git a/worker/bomb-subtests/crypto-md5.js b/worker/bomb-subtests/crypto-md5.js
@@ -181,9 +181,7 @@ function core_hmac_md5(key, data)
  */
 function safe_add(x, y)
 {
-  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
-  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-  return (msw << 16) | (lsw & 0xFFFF);
+  return ((x & 0xffffffff) + (y & 0xffffffff)) & 0xffffffff
 }
 
 /*
diff --git a/worker/bomb-subtests/crypto-sha1.js b/worker/bomb-subtests/crypto-sha1.js
@@ -127,9 +127,7 @@ function core_hmac_sha1(key, data)
  */
 function safe_add(x, y)
 {
-  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
-  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-  return (msw << 16) | (lsw & 0xFFFF);
+  return ((x & 0xffffffff) + (y & 0xffffffff)) & 0xffffffff
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -181,9 +181,7 @@ function core_hmac_md5(key, data)`
`181`	`181`	`*/`
`182`	`182`	`function safe_add(x, y)`
`183`	`183`	`{`
`184`		`- var lsw = (x & 0xFFFF) + (y & 0xFFFF);`
`185`		`- var msw = (x >> 16) + (y >> 16) + (lsw >> 16);`
`186`		`- return (msw << 16) \| (lsw & 0xFFFF);`
	`184`	`+ return ((x & 0xffffffff) + (y & 0xffffffff)) & 0xffffffff`
`187`	`185`	`}`
`188`	`186`
`189`	`187`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -127,9 +127,7 @@ function core_hmac_sha1(key, data)`
`127`	`127`	`*/`
`128`	`128`	`function safe_add(x, y)`
`129`	`129`	`{`
`130`		`- var lsw = (x & 0xFFFF) + (y & 0xFFFF);`
`131`		`- var msw = (x >> 16) + (y >> 16) + (lsw >> 16);`
`132`		`- return (msw << 16) \| (lsw & 0xFFFF);`
	`130`	`+ return ((x & 0xffffffff) + (y & 0xffffffff)) & 0xffffffff`
`133`	`131`	`}`
`134`	`132`
`135`	`133`	`/*`