Author: andrew
Date: Sun Apr  8 04:36:27 2012
New Revision: 234014
URL: http://svn.freebsd.org/changeset/base/234014

Log:
  Unlike other functions __aeabi_read_tp function must preserve r1-r3. The
  currently generated code clobbers r3. Fix this by loading ARM_TP_ADDRESS
  using inline assembly.
  
  Approved by:  imp (mentor)

Modified:
  head/lib/libc/arm/gen/__aeabi_read_tp.c

Modified: head/lib/libc/arm/gen/__aeabi_read_tp.c
==============================================================================
--- head/lib/libc/arm/gen/__aeabi_read_tp.c     Sun Apr  8 04:22:09 2012        
(r234013)
+++ head/lib/libc/arm/gen/__aeabi_read_tp.c     Sun Apr  8 04:36:27 2012        
(r234014)
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2012 Oleksandr Tymoshenko
+ * Copyright (c) 2012 Andrew Turner
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +37,9 @@ __FBSDID("$FreeBSD$");
 void *
 __aeabi_read_tp()
 {
-       void **_tp = (void **)ARM_TP_ADDRESS;
+       void *_tp;
 
-       return (*_tp);
+       asm("ldr %0, [%1]\n" : "=r"(_tp) : "r"(ARM_TP_ADDRESS));
+
+       return _tp;
 }
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to