From 03d7fa26a89d44349df86e29ac782d075856c570 Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@psgd.org>
Date: Wed, 10 May 2017 00:00:04 -0400
Subject: Sigh, right offset for the wrong register. Get the PC (the address we
 interrupted) rather than LR (the return address from the function we
 interrupted).

Also, change u_short and u_int to unsigned short and unsigned int, since
gcc recently decided that those aren't part of the C99 standard.

Finally, add profilable versions of memcpy, memset, and friends, because
they get called a lot in the course of unit testing, and it would be nice
to know who's calling them.
---
 libraries/libprof/gmon.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'libraries/libprof/gmon.c')

diff --git a/libraries/libprof/gmon.c b/libraries/libprof/gmon.c
index 458028b..92054fc 100644
--- a/libraries/libprof/gmon.c
+++ b/libraries/libprof/gmon.c
@@ -38,7 +38,6 @@
 #include <unistd.h>
 #include "gmon.h"
 #include "profil.h"
-#include <stdint.h>
 #include <string.h>
 
 #define bzero(ptr,size) memset (ptr, 0, size);
@@ -98,9 +97,9 @@ void monstartup (size_t lowpc, size_t highpc) {
 
 	p->tos = (struct tostruct *)cp;
 	cp += p->tossize;
-	p->kcount = (u_short *)cp;
+	p->kcount = (unsigned short *)cp;
 	cp += p->kcountsize;
-	p->froms = (u_short *)cp;
+	p->froms = (unsigned short *)cp;
 
 	p->tos[0].link = 0;
 
@@ -238,7 +237,7 @@ void _mcount_internal(uint32_t *frompcindex, uint32_t *selfpc) {
       goto done;
   }
   frompcindex = (uint32_t*)&p->froms[((long)frompcindex) / (HASHFRACTION * sizeof(*p->froms))];
-  toindex = *((u_short*)frompcindex); /* get froms[] value */
+  toindex = *((unsigned short*)frompcindex); /* get froms[] value */
   if (toindex == 0) {
     /*
     *	first time traversing this arc
@@ -247,7 +246,7 @@ void _mcount_internal(uint32_t *frompcindex, uint32_t *selfpc) {
     if (toindex >= p->tolimit) { /* more tos[] entries than we can handle! */
 	    goto overflow;
 	  }
-    *((u_short*)frompcindex) = (u_short)toindex; /* store new 'to' value into froms[] */
+    *((unsigned short*)frompcindex) = (unsigned short)toindex; /* store new 'to' value into froms[] */
     top = &p->tos[toindex];
     top->selfpc = (size_t)selfpc;
     top->count = 1;
@@ -283,8 +282,8 @@ void _mcount_internal(uint32_t *frompcindex, uint32_t *selfpc) {
       top = &p->tos[toindex];
       top->selfpc = (size_t)selfpc;
       top->count = 1;
-      top->link = *((u_short*)frompcindex);
-      *(u_short*)frompcindex = (u_short)toindex;
+      top->link = *((unsigned short*)frompcindex);
+      *(unsigned short*)frompcindex = (unsigned short)toindex;
       goto done;
     }
     /*
@@ -301,8 +300,8 @@ void _mcount_internal(uint32_t *frompcindex, uint32_t *selfpc) {
       top->count++;
       toindex = prevtop->link;
       prevtop->link = top->link;
-      top->link = *((u_short*)frompcindex);
-      *((u_short*)frompcindex) = (u_short)toindex;
+      top->link = *((unsigned short*)frompcindex);
+      *((unsigned short*)frompcindex) = (unsigned short)toindex;
       goto done;
     }
   }
-- 
cgit v1.2.3