diff options
Diffstat (limited to 'gcc/testsuite/gcc.dg')
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/20091013.c | 2 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/20100524-2.c | 10 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/20100609.c | 4 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/20100610.c | 48 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/20100615-2.c | 24 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/debug-1.c | 4 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/memopt-1.c | 2 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/memset.c | 22 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/nested-1.c | 28 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/pr46567-2.c | 6 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/pr46567.c | 8 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/pr47520.c | 34 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/pr47905.c | 10 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/props-2.c | 6 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/tm.exp | 8 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/vector-1.c | 2 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/tm/wrap-3.c | 2 |
17 files changed, 110 insertions, 110 deletions
diff --git a/gcc/testsuite/gcc.dg/tm/20091013.c b/gcc/testsuite/gcc.dg/tm/20091013.c index 945ec126bb6..d9b3b0ed3bc 100644 --- a/gcc/testsuite/gcc.dg/tm/20091013.c +++ b/gcc/testsuite/gcc.dg/tm/20091013.c @@ -8,6 +8,6 @@ f() { __transaction_relaxed { for (i=0; i < 10; ++i) - ringo(g); + ringo(g); } } diff --git a/gcc/testsuite/gcc.dg/tm/20100524-2.c b/gcc/testsuite/gcc.dg/tm/20100524-2.c index 3349838c1cf..a3578cb2797 100644 --- a/gcc/testsuite/gcc.dg/tm/20100524-2.c +++ b/gcc/testsuite/gcc.dg/tm/20100524-2.c @@ -2,7 +2,7 @@ /* { dg-options "-fgnu-tm -O0" } */ typedef struct { - int value[5]; + int value[5]; } type_t; __attribute__((transaction_safe)) @@ -11,10 +11,10 @@ type_t func_move (); __attribute__((transaction_safe)) type_t func_push (int type) { - type_t trace; + type_t trace; - if (type == 9) - trace = func_move(); + if (type == 9) + trace = func_move(); - return trace; + return trace; } diff --git a/gcc/testsuite/gcc.dg/tm/20100609.c b/gcc/testsuite/gcc.dg/tm/20100609.c index 91223e9623d..760f81ec6dd 100644 --- a/gcc/testsuite/gcc.dg/tm/20100609.c +++ b/gcc/testsuite/gcc.dg/tm/20100609.c @@ -8,7 +8,7 @@ int later; void MyFunc() { __transaction_relaxed { - funcNoReturn(); - later=8; + funcNoReturn(); + later=8; } } diff --git a/gcc/testsuite/gcc.dg/tm/20100610.c b/gcc/testsuite/gcc.dg/tm/20100610.c index b49b424d8df..0985b9ebc23 100644 --- a/gcc/testsuite/gcc.dg/tm/20100610.c +++ b/gcc/testsuite/gcc.dg/tm/20100610.c @@ -38,32 +38,32 @@ calculateCircumCircle (element_t* elementPtr) coordinate_t* circumCenterPtr = &elementPtr->circumCenter; ((void) (0)); if (numCoordinate == 2) { - circumCenterPtr->x = (coordinates[0].x + coordinates[1].x) / 2.0; - circumCenterPtr->y = (coordinates[0].y + coordinates[1].y) / 2.0; + circumCenterPtr->x = (coordinates[0].x + coordinates[1].x) / 2.0; + circumCenterPtr->y = (coordinates[0].y + coordinates[1].y) / 2.0; } else { - double ax = coordinates[0].x; - double ay = coordinates[0].y; - double bx = coordinates[1].x; - double by = coordinates[1].y; - double cx = coordinates[2].x; - double cy = coordinates[2].y; - double bxDelta = bx - ax; - double byDelta = by - ay; - double cxDelta = cx - ax; - double cyDelta = cy - ay; - double bDistance2 = (bxDelta * bxDelta) + (byDelta * byDelta); - double cDistance2 = (cxDelta * cxDelta) + (cyDelta * cyDelta); - double xNumerator = (byDelta * cDistance2) - (cyDelta * bDistance2); - double yNumerator = (bxDelta * cDistance2) - (cxDelta * bDistance2); - double denominator = 2 * ((bxDelta * cyDelta) - (cxDelta * byDelta)); - double rx = ax - (xNumerator / denominator); - double ry = ay + (yNumerator / denominator); - circumCenterPtr->x = rx; - circumCenterPtr->y = ry; + double ax = coordinates[0].x; + double ay = coordinates[0].y; + double bx = coordinates[1].x; + double by = coordinates[1].y; + double cx = coordinates[2].x; + double cy = coordinates[2].y; + double bxDelta = bx - ax; + double byDelta = by - ay; + double cxDelta = cx - ax; + double cyDelta = cy - ay; + double bDistance2 = (bxDelta * bxDelta) + (byDelta * byDelta); + double cDistance2 = (cxDelta * cxDelta) + (cyDelta * cyDelta); + double xNumerator = (byDelta * cDistance2) - (cyDelta * bDistance2); + double yNumerator = (bxDelta * cDistance2) - (cxDelta * bDistance2); + double denominator = 2 * ((bxDelta * cyDelta) - (cxDelta * byDelta)); + double rx = ax - (xNumerator / denominator); + double ry = ay + (yNumerator / denominator); + circumCenterPtr->x = rx; + circumCenterPtr->y = ry; } elementPtr->circumRadius = coordinate_distance(circumCenterPtr, - &coordinates[0]); + &coordinates[0]); } element_t* @@ -72,7 +72,7 @@ element_alloc (coordinate_t* coordinates, long numCoordinate) element_t* elementPtr; elementPtr = (element_t*)xmalloc(sizeof(element_t)); if (elementPtr) { - calculateCircumCircle(elementPtr); + calculateCircumCircle(elementPtr); } return elementPtr; } @@ -84,7 +84,7 @@ TMelement_alloc (coordinate_t* coordinates, long numCoordinate) element_t* elementPtr; elementPtr = (element_t*)xmalloc(sizeof(element_t)); if (elementPtr) { - calculateCircumCircle(elementPtr); + calculateCircumCircle(elementPtr); } return elementPtr; } diff --git a/gcc/testsuite/gcc.dg/tm/20100615-2.c b/gcc/testsuite/gcc.dg/tm/20100615-2.c index 7b5826ef155..4341e7d35ea 100644 --- a/gcc/testsuite/gcc.dg/tm/20100615-2.c +++ b/gcc/testsuite/gcc.dg/tm/20100615-2.c @@ -4,16 +4,16 @@ __attribute__((transaction_safe)) void Info_RemoveKey (char *s) { - char *o = 0; - while (1) - { - s++; - while (*s) - { - if (!*s) - return; - *o++ = *s++; - } - *o = 0; - } + char *o = 0; + while (1) + { + s++; + while (*s) + { + if (!*s) + return; + *o++ = *s++; + } + *o = 0; + } } diff --git a/gcc/testsuite/gcc.dg/tm/debug-1.c b/gcc/testsuite/gcc.dg/tm/debug-1.c index 94e1b3bb882..fae5d6bed42 100644 --- a/gcc/testsuite/gcc.dg/tm/debug-1.c +++ b/gcc/testsuite/gcc.dg/tm/debug-1.c @@ -10,9 +10,9 @@ testing(){ } main() { - b = 9898; + b = 9898; __transaction_relaxed { - z = c; + z = c; a = 888; testing(); } diff --git a/gcc/testsuite/gcc.dg/tm/memopt-1.c b/gcc/testsuite/gcc.dg/tm/memopt-1.c index 06d4f64a388..5388a81e282 100644 --- a/gcc/testsuite/gcc.dg/tm/memopt-1.c +++ b/gcc/testsuite/gcc.dg/tm/memopt-1.c @@ -16,7 +16,7 @@ f() xxx=8; yyy=9; for (i=0; i < 10; ++i) - ringo(g); + ringo(g); bye: ringo(g); } diff --git a/gcc/testsuite/gcc.dg/tm/memset.c b/gcc/testsuite/gcc.dg/tm/memset.c index 59a1c40d651..3b73ec6ee74 100644 --- a/gcc/testsuite/gcc.dg/tm/memset.c +++ b/gcc/testsuite/gcc.dg/tm/memset.c @@ -5,20 +5,20 @@ extern void *memset (void *, int, __SIZE_TYPE__); char array[4] = "aaaa"; -__attribute__((transaction_safe)) -void *my_memset() -{ +__attribute__((transaction_safe)) +void *my_memset() +{ return memset(array,'b',4); -} +} + - -int main() -{ +int main() +{ - __transaction_atomic { - my_memset(); - } - return 0; + __transaction_atomic { + my_memset(); + } + return 0; } /* { dg-final { scan-assembler "_ITM_memsetW" } } */ diff --git a/gcc/testsuite/gcc.dg/tm/nested-1.c b/gcc/testsuite/gcc.dg/tm/nested-1.c index cf500d1fc64..afadb83c183 100644 --- a/gcc/testsuite/gcc.dg/tm/nested-1.c +++ b/gcc/testsuite/gcc.dg/tm/nested-1.c @@ -7,20 +7,20 @@ void bar(void) __transaction_atomic { if (foo(1)) __transaction_atomic { - if (foo(2)) - __transaction_atomic { - if (foo(3)) - __transaction_atomic { - if (foo(4)) - foo(5); - else - __transaction_cancel; - } - else - __transaction_cancel; - } - else - __transaction_cancel; + if (foo(2)) + __transaction_atomic { + if (foo(3)) + __transaction_atomic { + if (foo(4)) + foo(5); + else + __transaction_cancel; + } + else + __transaction_cancel; + } + else + __transaction_cancel; } else __transaction_cancel; diff --git a/gcc/testsuite/gcc.dg/tm/pr46567-2.c b/gcc/testsuite/gcc.dg/tm/pr46567-2.c index c3376fc8e60..bfe0078bfdb 100644 --- a/gcc/testsuite/gcc.dg/tm/pr46567-2.c +++ b/gcc/testsuite/gcc.dg/tm/pr46567-2.c @@ -11,8 +11,8 @@ void SeqfileGetLine() __attribute__((transaction_callable)) void readLoop() { - SeqfileGetLine(); - if (global) - funky(); + SeqfileGetLine(); + if (global) + funky(); } diff --git a/gcc/testsuite/gcc.dg/tm/pr46567.c b/gcc/testsuite/gcc.dg/tm/pr46567.c index 56d70b467d1..bcc59adf509 100644 --- a/gcc/testsuite/gcc.dg/tm/pr46567.c +++ b/gcc/testsuite/gcc.dg/tm/pr46567.c @@ -1,4 +1,4 @@ -__attribute__((transaction_callable)) +__attribute__((transaction_callable)) static void SeqfileGetLine () { SSIGetFilePosition (); @@ -10,9 +10,9 @@ static void readLoop (int addfirst) if (!addfirst) { if (!addfirst) - { - SSIGetFilePosition (); - } + { + SSIGetFilePosition (); + } SeqfileGetLine (); } } diff --git a/gcc/testsuite/gcc.dg/tm/pr47520.c b/gcc/testsuite/gcc.dg/tm/pr47520.c index 8741bf16eda..80b976bd4cb 100644 --- a/gcc/testsuite/gcc.dg/tm/pr47520.c +++ b/gcc/testsuite/gcc.dg/tm/pr47520.c @@ -3,27 +3,27 @@ struct ReadSeqVars { - int format; - char *ss; + int format; + char *ss; }; void rms_feof(struct ReadSeqVars *); __attribute__((transaction_callable)) int ReadSeq(struct ReadSeqVars *V) { - if (V->format > 1) - { - if ((V->format != 2) && (V->ss != (void*)0) ) - { - V->format = 3; - } - } - else - { - int i = 0; - for (i = 0; i < 1; i++) - { - } - rms_feof(V); - } + if (V->format > 1) + { + if ((V->format != 2) && (V->ss != (void*)0) ) + { + V->format = 3; + } + } + else + { + int i = 0; + for (i = 0; i < 1; i++) + { + } + rms_feof(V); + } } diff --git a/gcc/testsuite/gcc.dg/tm/pr47905.c b/gcc/testsuite/gcc.dg/tm/pr47905.c index 362ed487bb6..c4b254930c1 100644 --- a/gcc/testsuite/gcc.dg/tm/pr47905.c +++ b/gcc/testsuite/gcc.dg/tm/pr47905.c @@ -6,9 +6,9 @@ void funcB(); void *thread() { - __transaction_relaxed - { - funcA(); - }; - funcB(); + __transaction_relaxed + { + funcA(); + }; + funcB(); } diff --git a/gcc/testsuite/gcc.dg/tm/props-2.c b/gcc/testsuite/gcc.dg/tm/props-2.c index 9c97e3b83e7..56a3ffa1367 100644 --- a/gcc/testsuite/gcc.dg/tm/props-2.c +++ b/gcc/testsuite/gcc.dg/tm/props-2.c @@ -10,9 +10,9 @@ extern crap() __attribute__((transaction_unsafe)); foo(){ __transaction_relaxed { - global++; - crap(); - george++; + global++; + crap(); + george++; } } diff --git a/gcc/testsuite/gcc.dg/tm/tm.exp b/gcc/testsuite/gcc.dg/tm/tm.exp index 5137597afe2..5480090fd3b 100644 --- a/gcc/testsuite/gcc.dg/tm/tm.exp +++ b/gcc/testsuite/gcc.dg/tm/tm.exp @@ -4,12 +4,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GCC; see the file COPYING3. If not see # <http://www.gnu.org/licenses/>. @@ -30,10 +30,10 @@ dg-init # Run the tests that are shared with C++ testing. dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/tm/*c]] \ - "" $DEFAULT_CFLAGS + "" $DEFAULT_CFLAGS # Run the C-only tests. dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] \ - "" $DEFAULT_CFLAGS + "" $DEFAULT_CFLAGS # All done. dg-finish diff --git a/gcc/testsuite/gcc.dg/tm/vector-1.c b/gcc/testsuite/gcc.dg/tm/vector-1.c index 927cca7db96..2dc43b0a517 100644 --- a/gcc/testsuite/gcc.dg/tm/vector-1.c +++ b/gcc/testsuite/gcc.dg/tm/vector-1.c @@ -9,7 +9,7 @@ void ** newElements; __attribute__((transaction_safe)) long TMqueue_push (void** queuePtr) -{ +{ long src; for (src = 1; src < 9; src++) { newElements[src+1] = queuePtr[src]; diff --git a/gcc/testsuite/gcc.dg/tm/wrap-3.c b/gcc/testsuite/gcc.dg/tm/wrap-3.c index 8be40406b51..0734436809f 100644 --- a/gcc/testsuite/gcc.dg/tm/wrap-3.c +++ b/gcc/testsuite/gcc.dg/tm/wrap-3.c @@ -5,7 +5,7 @@ void free (void *); void wrapper (void *) __attribute__((transaction_wrap (free))); void *p; -void foo() +void foo() { __transaction_relaxed { free (p); } } |