+2014-07-16 Pedro Alves <palves@redhat.com>
+
+ * gdb.trace/tfile.c: Include unistd.h and stdint.h.
+ (start_trace_file): Guard S_IRGRP and S_IROTH uses behind #ifdef.
+ (tfile_write_64, tfile_write_16, tfile_write_8, tfile_write_addr)
+ (tfile_write_buf): New functions.
+ (add_memory_block): Rewrite using the above.
+ (adjust_function_address): New function.
+ (FUNCTION_ADDRESS): New macro.
+ (write_basic_trace_file): Remove short_x local, and use
+ tfile_write_16. Change type of func_addr local to unsigned long
+ long. Use FUNCTION_ADDRESS instead of handling the Thumb bit
+ here. Cast argument of add_memory_block to char pointer.
+ (write_error_trace_file): Avoid alloca. Use FUNCTION_ADDRESS.
+ (main): Remove parameters.
+ * gdb.trace/tfile.exp: Remove nowarnings.
+
2014-07-15 Simon Marchi <simon.marchi@ericsson.com>
* gdb.base/debug-expr.exp: Test string evaluation with
GDB. */
#include <stdio.h>
+#include <unistd.h>
#include <string.h>
#include <fcntl.h>
#include <sys/stat.h>
+#include <stdint.h>
char spbuf[200];
start_trace_file (char *filename)
{
int fd;
+ mode_t mode = S_IRUSR | S_IWUSR;
- fd = open (filename, O_WRONLY|O_CREAT|O_APPEND,
- S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+#ifdef S_IRGRP
+ mode |= S_IRGRP;
+#endif
+
+#ifdef S_IROTH
+ mode |= S_IROTH;
+#endif
+
+ fd = open (filename, O_WRONLY|O_CREAT|O_APPEND, mode);
if (fd < 0)
return fd;
close (fd);
}
+static void
+tfile_write_64 (uint64_t value)
+{
+ memcpy (trptr, &value, sizeof (uint64_t));
+ trptr += sizeof (uint64_t);
+}
-void
-add_memory_block (char *addr, int size)
+static void
+tfile_write_16 (uint16_t value)
+{
+ memcpy (trptr, &value, sizeof (uint16_t));
+ trptr += sizeof (uint16_t);
+}
+
+static void
+tfile_write_8 (uint8_t value)
+{
+ memcpy (trptr, &value, sizeof (uint8_t));
+ trptr += sizeof (uint8_t);
+}
+
+static void
+tfile_write_addr (char *addr)
+{
+ tfile_write_64 ((uint64_t) (uintptr_t) addr);
+}
+
+static void
+tfile_write_buf (const void *addr, size_t size)
{
- short short_x;
- unsigned long long ll_x;
-
- *((char *) trptr) = 'M';
- trptr += 1;
- ll_x = (unsigned long) addr;
- memcpy (trptr, &ll_x, sizeof (unsigned long long));
- trptr += sizeof (unsigned long long);
- short_x = size;
- memcpy (trptr, &short_x, 2);
- trptr += 2;
memcpy (trptr, addr, size);
trptr += size;
}
+void
+add_memory_block (char *addr, int size)
+{
+ tfile_write_8 ('M');
+ tfile_write_addr (addr);
+ tfile_write_16 (size);
+ tfile_write_buf (addr, size);
+}
+
+/* Adjust a function's address to account for architectural
+ particularities. */
+
+static uintptr_t
+adjust_function_address (uintptr_t func_addr)
+{
+#if defined(__thumb__) || defined(__thumb2__)
+ /* Although Thumb functions are two-byte aligned, function
+ pointers have the Thumb bit set. Clear it. */
+ return func_addr & ~1;
+#else
+ return func_addr;
+#endif
+}
+
+/* Get a function's address as an integer. */
+
+#define FUNCTION_ADDRESS(FUN) adjust_function_address ((uintptr_t) &FUN)
+
void
write_basic_trace_file (void)
{
int fd, int_x;
- short short_x;
- long func_addr;
+ unsigned long long func_addr;
fd = start_trace_file (TFILE_DIR "tfile-basic.tf");
/* Dump tracepoint definitions, in syntax similar to that used
for reconnection uploads. */
- /* FIXME need a portable way to print function address in hex */
- func_addr = (long) &write_basic_trace_file;
-#if defined(__thumb__) || defined(__thumb2__)
- /* Although Thumb functions are two-byte aligned, function
- pointers have the Thumb bit set. Clear it. */
- func_addr &= ~1;
-#endif
+ func_addr = FUNCTION_ADDRESS (write_basic_trace_file);
- snprintf (spbuf, sizeof spbuf, "tp T1:%lx:E:0:0\n", func_addr);
+ snprintf (spbuf, sizeof spbuf, "tp T1:%llx:E:0:0\n", func_addr);
write (fd, spbuf, strlen (spbuf));
/* (Note that we would only need actions defined if we wanted to
test tdump.) */
/* (Encapsulate better if we're going to do lots of this; note that
buffer endianness is the target program's enddianness.) */
trptr = trbuf;
- short_x = 1;
- memcpy (trptr, &short_x, 2);
- trptr += 2;
+ tfile_write_16 (1);
+
tfsizeptr = trptr;
trptr += 4;
- add_memory_block (&testglob, sizeof (testglob));
+ add_memory_block ((char *) &testglob, sizeof (testglob));
/* Divide a variable between two separate memory blocks. */
- add_memory_block (&testglob2, 1);
+ add_memory_block ((char *) &testglob2, 1);
add_memory_block (((char*) &testglob2) + 1, sizeof (testglob2) - 1);
/* Go back and patch in the frame size. */
int_x = trptr - tfsizeptr - sizeof (int);
{
int fd;
const char made_up[] = "made-up error";
+ char hex[(sizeof (made_up) - 1) * 2 + 1];
int len = sizeof (made_up) - 1;
- char *hex = alloca (len * 2 + 1);
fd = start_trace_file (TFILE_DIR "tfile-error.tf");
/* Dump tracepoint definitions, in syntax similar to that used
for reconnection uploads. */
- /* FIXME need a portable way to print function address in hex */
- snprintf (spbuf, sizeof spbuf, "tp T1:%lx:E:0:0\n",
- (long) &write_basic_trace_file);
+ snprintf (spbuf, sizeof spbuf, "tp T1:%llx:E:0:0\n",
+ (unsigned long long) FUNCTION_ADDRESS (write_basic_trace_file));
write (fd, spbuf, strlen (spbuf));
/* (Note that we would only need actions defined if we wanted to
test tdump.) */
}
int
-main (int argc, char **argv, char **envp)
+main (void)
{
write_basic_trace_file ();
projects / binutils-gdb.git / commitdiff