diff --git a/src/aarch64/logic-aarch64.cc b/src/aarch64/logic-aarch64.cc
index cb82f71..de77e58 100644
--- a/src/aarch64/logic-aarch64.cc
+++ b/src/aarch64/logic-aarch64.cc
@@ -4755,7 +4755,9 @@
 
 int64_t Simulator::FPToInt64(double value, FPRounding rmode) {
   value = FPRoundInt(value, rmode);
-  if (value >= kXMaxInt) {
+  // This is equivalent to "if (value >= kXMaxInt)" but avoids rounding issues
+  // as a result of kMaxInt not being representable as a double.
+  if (value >= 9223372036854775808.) {
     return kXMaxInt;
   } else if (value < kXMinInt) {
     return kXMinInt;
@@ -4788,7 +4790,9 @@
 
 uint64_t Simulator::FPToUInt64(double value, FPRounding rmode) {
   value = FPRoundInt(value, rmode);
-  if (value >= kXMaxUInt) {
+  // This is equivalent to "if (value >= kXMaxUInt)" but avoids rounding issues
+  // as a result of kMaxUInt not being representable as a double.
+  if (value >= 18446744073709551616.) {
     return kXMaxUInt;
   } else if (value < 0.0) {
     return 0;