Update Xray for PNaCl

native_client_sdk/src/libraries/xray/symtable.c

 /* Copyright (c) 2013 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /* XRay symbol table */
 
 #define _GNU_SOURCE
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #if defined(__GLIBC__)
 #include <dlfcn.h>
 #endif
 
 #include "xray/xray_priv.h"
+#define PNACL_STRING_OFFSET (0x10000000)

[nfullagar1, 2013/07/18 23:49:42]

one thought (for another CL...) is to have a known string addr at runtime to
base off of instead of using a magic offset.  As it is, if this offset changes
we'll need to remember to change it here as well.

 
 #if defined(XRAY)
 
 bool g_symtable_debug = false;
 
 struct XRayFrameInfo {
   int times_called;
   int total_ticks;
 };
 
@@ skipping 109 matching lines @@
     printf("adding symbol %s\n", recorded_name);
   /* construct a symbol and put it in the symbol table */
   symbol = XRaySymbolCreate(symtab->symbol_pool, recorded_name);
   return XRaySymbolTableAdd(symtab, symbol, addr);
 }
 
 struct XRaySymbol* XRaySymbolTableLookup(struct XRaySymbolTable* symtab,
                                          uint32_t addr) {
   void *x = XRayHashTableLookup(symtab->hash_table, addr);
   struct XRaySymbol* r = (struct XRaySymbol*)x;
+
+#if defined(__pnacl__)
+  if (r == NULL) {
+    /* Addresses are trimed to 24 bits for internal storage, so we need to
+     * add this offset back in order to get the real address.
+     */
+    addr |= PNACL_STRING_OFFSET;
+    const char* name = (const char*)addr;
+    struct XRaySymbol* symbol = XRaySymbolCreate(symtab->symbol_pool, name);
+    r = XRaySymbolTableAdd(symtab, symbol, addr);
+  }
+#endif
+
 #if defined(__GLIBC__)
   if (r == NULL) {
     Dl_info info;
     if (dladdr((const void*)addr, &info) != 0)
       if (info.dli_sname)
         r = XRaySymbolTableAddByName(symtab, info.dli_sname, addr);
   }
 #endif
   return r;
 }
@@ skipping 20 matching lines @@
 /* Frees a symbol table. */
 void XRaySymbolTableFree(struct XRaySymbolTable* symtab) {
   XRayStringPoolFree(symtab->string_pool);
   XRaySymbolPoolFree(symtab->symbol_pool);
   XRayHashTableFree(symtab->hash_table);
   symtab->num_symbols = 0;
   XRayFree(symtab);
 }
 
 #endif  /* XRAY */