Index: src/Registers.hpp
===================================================================
--- src/Registers.hpp
+++ src/Registers.hpp
@@ -332,7 +332,7 @@
     return true;
   if (regNum < 0)
     return false;
-  if (regNum > 15)
+  if (regNum > 16)
     return false;
   return true;
 }
@@ -375,6 +375,8 @@
     return _registers.__r14;
   case UNW_X86_64_R15:
     return _registers.__r15;
+  case UNW_X86_64_RIP:
+    return _registers.__rip;
   }
   _LIBUNWIND_ABORT("unsupported x86_64 register");
 }
@@ -435,6 +437,9 @@
   case UNW_X86_64_R15:
     _registers.__r15 = value;
     return;
+  case UNW_X86_64_RIP:
+    _registers.__rip = value;
+    return;
   }
   _LIBUNWIND_ABORT("unsupported x86_64 register");
 }
@@ -477,6 +482,8 @@
     return "r14";
   case UNW_X86_64_R15:
     return "r15";
+  case UNW_X86_64_RIP:
+    return "rip";
   case UNW_X86_64_XMM0:
     return "xmm0";
   case UNW_X86_64_XMM1: