[pph] Rename tests according to PPH include level. (issue4678051)

Message ID	20110712011051.DE91F222675@jade.mtv.corp.google.com
State	New
Headers	show Return-Path: <gcc-patches-return-296599-incoming=patchwork.ozlabs.org@gcc.gnu.org> To: reply@codereview.appspotmail.com, dnovillo@google.com, gcc-patches@gcc.gnu.org Subject: [pph] Rename tests according to PPH include level. (issue4678051) Message-Id: <20110712011051.DE91F222675@jade.mtv.corp.google.com> Date: Mon, 11 Jul 2011 18:10:51 -0700 (PDT) From: crowl@google.com (Lawrence Crowl) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org

Sounds good, much easier to prioritize now. We should probably reflect these naming changes in our progress sheet. Gab On Mon, Jul 11, 2011 at 6:10 PM, Lawrence Crowl <crowl@google.com> wrote: > Rename tests to reflect the "level" of testing. Essentially, > we are changing "?1*" meaning "we expect it to work" > into different levels: > > 0 - tests with no pph inclusions (usually headers) > 1 - tests with a single leading pph file > 2 - tests with a nested leading pph files > 3 - tests non-leading pph files, but at most simple merging > 4 - tests non-leading pph files, with significant merging > > And as a special case, we are currently testing without the C++ > standard library begin compiled with PPH. However, we intend to do so > later. These levels capture that distinction. > > 5 - tests with no pph inclusions plus C++stdlib merging > 6 - tests with nested leading plus C++stdlib merging > 7 - tests non-leading pph files plus C++stdlib merging > > Finally, the tests we con't expect to "work" are > > 8 - tests for secondary diagnostic features we would like to have > 9 - tests for tertiary diagnostic features we probably do not want > > Also did some test cleanup. > > Add test c4pr36533 to capture non-leading pph include. > Refactored common code in c?pr36533.* into a0pr36533.h. > Make all include guards match their file name, > except when we are explicitly testing the include guard behavior. > Shorten some file names. > Adjust dg comments to current state. > > The diff turns out to not be very useful because it does not track across > file name changes. > > > Index: gcc/testsuite/ChangeLog.pph > > 2011-07-11 Lawrence Crowl <crowl@google.com> > > * g++.dg/pph/README: Explain new naming scheme. > * g++.dg/pph/c120060625-1.cc: Rename to c1-20060625-1.cc. > * g++.dg/pph/c120060625-1.h: Rename to c0-20060625-1.h; edit deps. > * g++.dg/pph/c1altinc.cc: Rename to c3altinc.cc. > * g++.dg/pph/c1altinc1.h: Rename to c0altinc1.h; edit deps. > * g++.dg/pph/c1altinc2.h: Rename to c3altinc2.h; edit deps. > * g++.dg/pph/c1attr-warn-unused-result.cc: Rename to > c1attr-warn-unused.cc. > * g++.dg/pph/c1attr-warn-unused-result.h: Rename to > c0attr-warn-unused.h; edit deps. > * g++.dg/pph/x1autometh.h: Rename to x0autometh.h; edit deps. > * g++.dg/pph/c1builtin-integral-1.cc: Rename to c1builtin-integral.cc. > * g++.dg/pph/c1builtin-integral-1.h: Rename to c0builtin-integral.h; > edit deps. > * g++.dg/pph/c1builtin-object-size-2.cc: Rename to c1builtin-objsize.cc. > * g++.dg/pph/c1builtin-object-size-2.h: Rename to c0builtin-objsize.h; > edit deps. > * g++.dg/pph/c2builtin1.cc: Rename to c3builtin1.cc. > * g++.dg/pph/c2builtin1.h: Rename to c0builtin1.h; edit deps. > * g++.dg/pph/c2builtin2.cc: Rename to c3builtin2.cc. > * g++.dg/pph/c2builtin2.h: Rename to c1builtin2.h; edit deps. > * g++.dg/pph/c2builtin3.h: Rename to c1builtin3.h; edit deps. > * g++.dg/pph/a2builtin4.h: Rename to a0builtin4.h; edit deps. > * g++.dg/pph/c2builtin5.h: Rename to c0builtin5.h; edit deps. > * g++.dg/pph/c2builtin6.h: Rename to c0builtin6.h; edit deps. > * g++.dg/pph/c1chained1.h: Rename to c0chained1.h; edit deps. > * g++.dg/pph/c1chained2.h: Rename to c0chained2.h; edit deps. > * g++.dg/pph/d2dupguard.cc: Rename to d8dupguard.cc. > * g++.dg/pph/c2dupguard1.h: Rename to c0dupguard1.h; edit deps. > * g++.dg/pph/c2dupguard2.h: Rename to c0dupguard2.h; edit deps. > * g++.dg/pph/a1dynarray-dcl1.hi: Rename to a0dynarray-dcl1.hi; > edit deps. > * g++.dg/pph/a1dynarray-dcl2a.hi: Rename to a0dynarray-dcl2a.hi; > edit deps. > * g++.dg/pph/a1dynarray-dcl2b.hi: Rename to a0dynarray-dcl2b.hi; > edit deps. > * g++.dg/pph/a1dynarray-dcl3.hi: Rename to a0dynarray-dcl3.hi; > edit deps. > * g++.dg/pph/a1dynarray-dcl4.hi: Rename to a0dynarray-dcl4.hi; > edit deps. > * g++.dg/pph/a1dynarray-dfn1a.hi: Rename to a0dynarray-dfn1a.hi; > edit deps. > * g++.dg/pph/a1dynarray-dfn1b.hi: Rename to a0dynarray-dfn1b.hi; > edit deps. > * g++.dg/pph/a1dynarray-dfn2a.hi: Rename to a0dynarray-dfn2a.hi; > edit deps. > * g++.dg/pph/a1dynarray-dfn2b.hi: Rename to a0dynarray-dfn2b.hi; > edit deps. > * g++.dg/pph/a1dynarray-dfn2c.hi: Rename to a0dynarray-dfn2c.hi; > edit deps. > * g++.dg/pph/a1dynarray-dfn3a.hi: Rename to a0dynarray-dfn3a.hi; > edit deps. > * g++.dg/pph/a1dynarray-dfn3b.hi: Rename to a0dynarray-dfn3b.hi; > edit deps. > * g++.dg/pph/a1dynarray-dfn3c.hi: Rename to a0dynarray-dfn3c.hi; > edit deps. > * g++.dg/pph/a1dynarray-hlp1.cci: Rename to a0dynarray-hlp1.cci. > * g++.dg/pph/a1dynarray-use1.cci: Rename to a0dynarray-use1.cci. > * g++.dg/pph/a1dynarray-use2.cci: Rename to a0dynarray-use2.cci. > * g++.dg/pph/a1dynarray-use3a.cci: Rename to a0dynarray-use3a.cci. > * g++.dg/pph/a1dynarray-use3b.cci: Rename to a0dynarray-use3b.cci. > * g++.dg/pph/a1dynarray-use4a.cci: Rename to a0dynarray-use4a.cci. > * g++.dg/pph/a1dynarray-use4b.cci: Rename to a0dynarray-use4b.cci. > * g++.dg/pph/x1dynarray1.h: Rename to x0dynarray1.h; edit deps. > * g++.dg/pph/x1dynarray2.h: Rename to x0dynarray2.h; edit deps. > * g++.dg/pph/x1dynarray3.cc: Rename to x6dynarray3.cc. > * g++.dg/pph/x1dynarray3.h: Rename to x5dynarray3.h; edit deps. > * g++.dg/pph/x1dynarray4.cc: Rename to x6dynarray4.cc. > * g++.dg/pph/x1dynarray4.h: Rename to x0dynarray4.h; edit deps. > * g++.dg/pph/x1dynarray5.cc: Rename to x7dynarray5.cc. > * g++.dg/pph/x1dynarray5.h: Rename to x6dynarray5.h; edit deps. > * g++.dg/pph/x1dynarray6.cc: Rename to x7dynarray6.cc. > * g++.dg/pph/x1dynarray6.h: Rename to x6dynarray6.h; edit deps. > * g++.dg/pph/x1dynarray7.cc: Rename to x7dynarray7.cc. > * g++.dg/pph/x1dynarray7.h: Rename to x5dynarray7.h; edit deps. > * g++.dg/pph/c1eabi1.h: Rename to c0eabi1.h; edit deps. > * g++.dg/pph/c2eabi1.cc: Rename to c4eabi1.cc. > * g++.dg/pph/c2eabi1.h: Rename to c4eabi1.h; edit deps. > * g++.dg/pph/c1empty.h: Rename to c0empty.h; edit deps. > * g++.dg/pph/c1field.h: Rename to c0field.h; edit deps. > * g++.dg/pph/c1funcmac.h: Rename to c0funcmac.h; edit deps. > * g++.dg/pph/c1funcstatic.h: Rename to c0funcstatic.h; edit deps. > * g++.dg/pph/x1functions.cc: Rename to x2functions.cc. > * g++.dg/pph/c1functions.h: Rename to c0functions.h; edit deps. > * g++.dg/pph/x1globalref.h: Rename to x0globalref.h; edit deps. > * g++.dg/pph/c1guarded.cc: Rename to c3guarded.cc. > * g++.dg/pph/c1guarded1.h: Rename to c0guarded1.h; edit deps. > * g++.dg/pph/x1hardlookup.h: Rename to x0hardlookup.h; edit deps. > * g++.dg/pph/a1integer.h: Rename to a0integer.h; edit deps. > * g++.dg/pph/c1limits-externalid.h: Rename to c0limits-externalid.h; > edit deps. > * g++.dg/pph/p1mean.cc: Rename to p4mean.cc. > * g++.dg/pph/c2meteor-contest.cc: Rename to c4meteor-contest.cc. > * g++.dg/pph/c1meteor-contest.h: Rename to c0meteor-contest.h; > edit deps. > * g++.dg/pph/c2meteor-contest.h: Rename to c4meteor-contest.h; > edit deps. > * g++.dg/pph/c1multinc.cc: Rename to c3multinc.cc. > * g++.dg/pph/c1multinc1.h: Rename to c0multinc1.h; edit deps. > * g++.dg/pph/c1multinc2.h: Rename to c3multinc2.h; edit deps. > * g++.dg/pph/x1namespace.h: Rename to x0namespace.h; edit deps. > * g++.dg/pph/x2nontrivinit.cc: Rename to x1nontrivinit.cc. > * g++.dg/pph/x2nontrivinit.h: Rename to x0nontrivinit.h; edit deps. > * g++.dg/pph/d2null.h: Rename to d0null.h; edit deps. > * g++.dg/pph/y2overload.cc: Rename to y9overload.cc. > * g++.dg/pph/x2overload1.h: Rename to x0overload1.h; edit deps. > * g++.dg/pph/x2overload2.h: Rename to x0overload2.h; edit deps. > * g++.dg/pph/x2overload3.h: Rename to x1overload3.h; edit deps. > * g++.dg/pph/c2paste.cc: Rename to c1paste.cc. > * g++.dg/pph/c2paste.h: Rename to c0paste.h; edit deps. > * g++.dg/pph/a0pr36533.h: New. > * g++.dg/pph/c1pr36533.cc: Rename to c2pr36533.cc. > * g++.dg/pph/c4pr36533.cc: New. > * g++.dg/pph/c4pr36533.h: New. > * g++.dg/pph/c1pr44948-1a.h: Rename to c0pr44948-1a.h; edit deps. > * g++.dg/pph/c1return-5.h: Rename to c0return-5.h; edit deps. > * g++.dg/pph/c1simple.cc: Rename to c2simple.cc. > * g++.dg/pph/c1simple1.h: Rename to c0simple1.h; edit deps. > * g++.dg/pph/y2smother.cc: Rename to y8inc-nmspc.cc. > * g++.dg/pph/x1special.h: Rename to x0special.h; edit deps. > * g++.dg/pph/c1struct.h: Rename to c0struct.h; edit deps. > * g++.dg/pph/x1struct0.h: Rename to x0struct0.h; edit deps. > * g++.dg/pph/x1struct1.cc: Rename to x2struct1.cc. > * g++.dg/pph/x1struct2.cc: Rename to x2struct2.cc. > * g++.dg/pph/d1symnotinc.h: Rename to d0symnotinc.h; edit deps. > * g++.dg/pph/x1template.h: Rename to x0template.h; edit deps. > * g++.dg/pph/x1ten-hellos.h: Rename to x0ten-hellos.h; edit deps. > * g++.dg/pph/x1tmplclass.h: Rename to x0tmplclass.h; edit deps. > * g++.dg/pph/x1tmplfunc.h: Rename to x0tmplfunc.h; edit deps. > * g++.dg/pph/x1typerefs.cc: Rename to x2typerefs.cc. > * g++.dg/pph/c1typerefs.h: Rename to c0typerefs.h; edit deps. > * g++.dg/pph/d1unguarded.h: Rename to d0unguarded.h; edit deps. > * g++.dg/pph/x1variables.cc: Rename to x2variables.cc. > * g++.dg/pph/c1variables.h: Rename to c0variables.h; edit deps. > * g++.dg/pph/c1varorder.h: Rename to c0varorder.h; edit deps. > > > Index: gcc/testsuite/g++.dg/pph/x2nontrivinit.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x2nontrivinit.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x2nontrivinit.h (working copy) > @@ -1,5 +0,0 @@ > -#ifndef X2NONTRIVINIT_H > -#define X2NONTRIVINIT_H > -int y = 0; > -int x = y+1; > -#endif > Index: gcc/testsuite/g++.dg/pph/c0chained1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0chained1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0chained1.h (working copy) > @@ -1,4 +1,4 @@ > -#ifndef C1CHAINED1_H > -#define C1CHAINED1_H > +#ifndef C0CHAINED1_H > +#define C0CHAINED1_H > #define ONE 1 > #endif > Index: gcc/testsuite/g++.dg/pph/c0field.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0field.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0field.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef C1FIELD_H > -#define C1FIELD_H > +#ifndef C0FIELD_H > +#define C0FIELD_H > typedef int language; > struct program { > language field; > Index: gcc/testsuite/g++.dg/pph/c1varorder.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1varorder.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1varorder.h (working copy) > @@ -1,7 +0,0 @@ > -#ifndef __C1VARORDER_H > -#define __C1VARORDER_H > - > -int var1; > -int var2; > - > -#endif > Index: gcc/testsuite/g++.dg/pph/x1struct2.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1struct2.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1struct2.cc (working copy) > @@ -1,10 +0,0 @@ > -#include "x1struct2.h" > - > -type D::method() > -{ static int x = 2; > - return fld + mbr + gbl; } > - > -type D::mbr = 4; > -typedef D D2; > -D2 var1; > -D2 var2 = var1; > Index: gcc/testsuite/g++.dg/pph/c0guarded1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0guarded1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0guarded1.h (working copy) > @@ -1,4 +1,4 @@ > -#ifndef C1GUARDED1_H > -#define C1GUARDED1_H > +#ifndef C0GUARDED1_H > +#define C0GUARDED1_H > typedef int type; > #endif > Index: gcc/testsuite/g++.dg/pph/c0builtin6.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0builtin6.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0builtin6.h (working copy) > @@ -1,6 +1,6 @@ > -#ifndef C2BUILTIN6_H > -#define C2BUILTIN6_H > -#include "a2builtin4.h" > +#ifndef C0BUILTIN6_H > +#define C0BUILTIN6_H > +#include "a0builtin4.h" > const char *refile = VALUE(__FILE__); > const char *reline = VALUE(__LINE__); > #endif > Index: gcc/testsuite/g++.dg/pph/x1functions.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1functions.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1functions.h (working copy) > @@ -1,6 +1,6 @@ > #ifndef X1FUNCTIONS_H > #define X1FUNCTIONS_H > -#include "c1functions.h" > +#include "c0functions.h" > inline int extern_inline(int i) // lazy body > { return extern_then_body(i); } > struct type { > Index: gcc/testsuite/g++.dg/pph/x1dynarray7.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray7.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray7.cc (working copy) > @@ -1,28 +0,0 @@ > -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } > -// { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } > -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } > -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } > - > -#include <algorithm> > -#include <iostream> > - > -#include "x1dynarray7.h" > - > -#include "a1integer.h" > -typedef tst::dynarray< integer > integer_array; > - > -#include "a1dynarray-hlp1.cci" > - > -int main() > -{ > - #include "a1dynarray-use1.cci" > - dump( source ); > - dump( sorted ); > - std::sort( sorted.begin(), sorted.end() ); > - dump( sorted ); > - #include "a1dynarray-use2.cci" > - dump( target ); > - #include "a1dynarray-use3b.cci" > - #include "a1dynarray-use4b.cci" > - return sum - 23; > -} > Index: gcc/testsuite/g++.dg/pph/x6dynarray3.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x6dynarray3.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x6dynarray3.cc (working copy) > @@ -1,15 +1,15 @@ > // { dg-do run } > > -#include "x1dynarray3.h" > +#include "x5dynarray3.h" > > -#include "a1integer.h" > +#include "a0integer.h" > typedef tst::dynarray< integer > integer_array; > > int main() > { > - #include "a1dynarray-use1.cci" > - #include "a1dynarray-use2.cci" > - #include "a1dynarray-use3a.cci" > - #include "a1dynarray-use4a.cci" > + #include "a0dynarray-use1.cci" > + #include "a0dynarray-use2.cci" > + #include "a0dynarray-use3a.cci" > + #include "a0dynarray-use4a.cci" > return sum - 25; > } > Index: gcc/testsuite/g++.dg/pph/x1dynarray6.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray6.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray6.h (working copy) > @@ -1,23 +0,0 @@ > -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } > -// { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } > -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } > -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } > - > -#ifndef X1DYNARRAY6_H > -#define X1DYNARRAY6_H > - > -#include "x1dynarray4.h" > - > -#include <new> > -#include <memory> > -#include <stdexcept> > - > -namespace tst { > - > -#include "a1dynarray-dfn1b.hi" > -#include "a1dynarray-dfn2c.hi" > -#include "a1dynarray-dfn3c.hi" > - > -} // namespace tst > - > -#endif > Index: gcc/testsuite/g++.dg/pph/y2smother.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/y2smother.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/y2smother.cc (working copy) > @@ -1,4 +0,0 @@ > -namespace smother { > -#include "x1struct1.h" > -// { dg-error "pph file not included at global scope" "" { xfail *-*-* } } > -} > Index: gcc/testsuite/g++.dg/pph/c4meteor-contest.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c4meteor-contest.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c4meteor-contest.cc (working copy) > @@ -1,7 +1,7 @@ > -/* { dg-timeout 2 { target *-*-* } } */ > -// { dg-xfail-if "INFINITE" { "*-*-*" } { "-fpph-map=pph.map" } } > /* { dg-options "-w" } */ > -#include "c2meteor-contest.h" > +// pph asm xdiff > + > +#include "c4meteor-contest.h" > > int main(int argc, char **argv) { > if(argc > 1) > Index: gcc/testsuite/g++.dg/pph/x1autometh.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1autometh.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1autometh.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "x1autometh.h" > +#include "x0autometh.h" > > void function() { > base var1; > Index: gcc/testsuite/g++.dg/pph/c0simple1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0simple1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0simple1.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef C1SIMPLE1_H > -#define C1SIMPLE1_H > +#ifndef C0SIMPLE1_H > +#define C0SIMPLE1_H > > #define assert(x) yellow(x) > extern void yellow(int); > Index: gcc/testsuite/g++.dg/pph/x1tmplfunc.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1tmplfunc.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1tmplfunc.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "x1tmplfunc.h" > +#include "x0tmplfunc.h" > > type val = 3; > > Index: gcc/testsuite/g++.dg/pph/a1dynarray-use3a.cci > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-use3a.cci (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-use3a.cci (working copy) > @@ -1,8 +0,0 @@ > - try { > - integer t = target.at(32); > - } > - catch ( integer_array::size_type ) { > - } > - catch ( ... ) { > - return 1; > - } > Index: gcc/testsuite/g++.dg/pph/x0tmplfunc.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0tmplfunc.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0tmplfunc.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1TMPLFUNC_H > -#define X1TMPLFUNC_H > +#ifndef X0TMPLFUNC_H > +#define X0TMPLFUNC_H > typedef int type; > extern type val; > > Index: gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.cc (working copy) > @@ -1,2 +0,0 @@ > -/* { dg-options "-O2 -w -fpermissive" } */ > -#include "c1builtin-object-size-2.h" > Index: gcc/testsuite/g++.dg/pph/c0attr-warn-unused.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0attr-warn-unused.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0attr-warn-unused.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > +#ifndef C0ATTR_WARN_UNUSED_H > +#define C0ATTR_WARN_UNUSED_H > /* { dg-options "-w" } */ > > #define WUR __attribute__((warn_unused_result)) > Index: gcc/testsuite/g++.dg/pph/c1return-5.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1return-5.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1return-5.h (working copy) > @@ -1,16 +0,0 @@ > -// { dg-options "-mpreferred-stack-boundary=4" } > - > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > - > -/* This compile only test is to detect an assertion failure in stack branch > - development. */ > -struct bar > -{ > - int x; > -} __attribute__((aligned(64))); > - > - > -struct bar > -foo (void) { } > -#endif > Index: gcc/testsuite/g++.dg/pph/x2overload1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x2overload1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x2overload1.h (working copy) > @@ -1,4 +0,0 @@ > -#ifndef X2OVERLOAD1_H > -#define X2OVERLOAD1_H > -int o(double x); > -#endif > Index: gcc/testsuite/g++.dg/pph/a0pr36533.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/a0pr36533.h (revision 0) > +++ gcc/testsuite/g++.dg/pph/a0pr36533.h (revision 0) > @@ -0,0 +1,165 @@ > +typedef struct S1 > +{ > + unsigned long s1; > + struct S1 *s2; > + char *s3; > +} S1; > + > +typedef struct > +{ > + unsigned int s4; > + unsigned int s5; > + int s6; > + unsigned int *s7; > +} S2; > + > +typedef struct > +{ > + unsigned int s8; > + unsigned short s9; > + unsigned char s10; > + unsigned char s11; > + char s12[255]; > +} S3; > + > +typedef struct > +{ > + unsigned int s4; > + unsigned short s13; > + unsigned short s14; > +} S4; > + > +typedef struct > +{ > + char s15[16]; > + unsigned long s16; > +} S5; > + > +typedef struct > +{ > + char s15[48]; > + S5 *s17; > +} S6; > + > +typedef struct > +{ > + S1 *s18; > +} S7; > + > +__attribute__((regparm (3), noinline)) int > +fn1 (const char *x, void *y, S1 *z) > +{ > + asm volatile ("" : : : "memory"); > + return *x + (y != 0); > +} > + > +__attribute__((regparm (3), noinline)) int > +fn2 (const char *x, int y, S2 *z) > +{ > + asm volatile ("" : : : "memory"); > + return 0; > +} > + > +static inline __attribute__ ((always_inline)) unsigned int > +fn4 (unsigned short x) > +{ > + unsigned len = x; > + if (len == ((1 << 16) - 1)) > + return 1 << 16; > + return len; > +} > + > +static inline __attribute__ ((always_inline)) S3 * > +fn3 (S3 *p) > +{ > + return (S3 *) ((char *) p + fn4 (p->s9)); > +} > + > +__attribute__((regparm (3), noinline)) int > +fn5 (void) > +{ > + asm volatile ("" : : : "memory"); > + return 0; > +} > + > +static inline __attribute__ ((always_inline)) int > +fn6 (S3 *w, int x, S2 *y, S4 *z) > +{ > + int a = 2; > + char *b = (char *) w; > + S2 c = *y; > + > + while ((char *) w < b + x - 2 * sizeof (S4)) > + { > + if (w->s10 && w->s8) > + { > + fn2 (w->s12, w->s10, &c); > + z--; > + z->s4 = c.s4; > + z->s13 = (unsigned short) ((char *) w - b); > + z->s14 = w->s9; > + a++; > + fn5 (); > + } > + > + w = fn3 (w); > + } > + return a; > +} > + > +__attribute__((regparm (3), noinline)) unsigned int > +test (void *u, S6 *v, S1 **w, S7 *x, S2 *y, S1 *z) > +{ > + unsigned b = v->s17->s16; > + unsigned a; > + S4 *c; > + unsigned d, e, f, i; > + > + fn1 (__func__, u, x->s18); > + c = (S4 *) (z->s3 + b); > + a = fn6 ((S3 *) (*w)->s3, b, y, c); > + c -= a; > + f = 0; > + e = 2; > + for (i = a - 1; ; i--) > + { > + if (f + (unsigned short) (c[i].s14 / 2) > b / 2) > + break; > + f += c[i].s14; > + e++; > + } > + d = a - e; > + return c[d].s4; > +} > + > +int main (void) > +{ > + char *p = mmap (NULL, 131072, PROT_READ | PROT_WRITE, > + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); > + S1 wb, z, *w; > + S6 v; > + S7 x; > + S2 y; > + S5 vb; > + S4 s4; > + if (p == MAP_FAILED) > + return 0; > + if (munmap (p + 65536, 65536) < 0) > + return 0; > + memset (&wb, 0, sizeof (wb)); > + memset (&z, 0, sizeof (z)); > + memset (&v, 0, sizeof (v)); > + memset (&x, 0, sizeof (x)); > + memset (&y, 0, sizeof (y)); > + memset (&vb, 0, sizeof (vb)); > + memset (&s4, 0, sizeof (s4)); > + s4.s14 = 254; > + z.s3 = p + 65536 - 2 * sizeof (S4); > + w = &wb; > + v.s17 = &vb; > + vb.s16 = 2 * sizeof (S4); > + memcpy (z.s3, &s4, sizeof (s4)); > + memcpy (z.s3 + sizeof (s4), &s4, sizeof (s4)); > + test ((void *) 0, &v, &w, &x, &y, &z); > + return 0; > +} > Index: gcc/testsuite/g++.dg/pph/d0symnotinc.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/d0symnotinc.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/d0symnotinc.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef D1SDYMNOTINC_H > -#define D1SDYMNOTINC_H > +#ifndef D0SDYMNOTINC_H > +#define D0SDYMNOTINC_H > struct T { int f; }; > struct T NAME = { VALUE }; // { dg-error "was not declared in this scope" } > #endif > Index: gcc/testsuite/g++.dg/pph/c4eabi1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c4eabi1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c4eabi1.h (working copy) > @@ -2,8 +2,8 @@ > // FIXME pph - Enabling PPH for this file causes memory problems in cc1plus. > // c1eabi1.h c1eabi1.pph > > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > +#ifndef C4EABI1_H > +#define C4EABI1_H > > /* This file tests most of the non-C++ run-time helper functions > described in Section 4 of the "Run-Time ABI for the ARM > Index: gcc/testsuite/g++.dg/pph/x1template.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1template.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1template.h (working copy) > @@ -1,20 +0,0 @@ > -#ifndef X1TEMPLATE_H > -#define X1TEMPLATE_H > -extern int x; > -struct B; > -template< typename T > > -struct C { > - T* b; > - int method(); > - int another() > - { return *b; } > -}; > -template< typename T > > -int C< T >::method() > -{ return x; } > -struct D : C< int > { > - int method(); > - int another() > - { return *b; } > -}; > -#endif > Index: gcc/testsuite/g++.dg/pph/x0dynarray4.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0dynarray4.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0dynarray4.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1DYNARRAY4_H > -#define X1DYNARRAY4_H > +#ifndef X0DYNARRAY4_H > +#define X0DYNARRAY4_H > > #include <stddef.h> > > @@ -8,9 +8,9 @@ namespace tst { > template< typename T > > struct dynarray > { > - #include "a1dynarray-dcl1.hi" > - #include "a1dynarray-dcl2b.hi" > - #include "a1dynarray-dcl3.hi" > + #include "a0dynarray-dcl1.hi" > + #include "a0dynarray-dcl2b.hi" > + #include "a0dynarray-dcl3.hi" > }; > > } // namespace tst > Index: gcc/testsuite/g++.dg/pph/c0variables.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0variables.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0variables.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef C1VARIABLES_H > -#define C1VARIABLES_H > +#ifndef C0VARIABLES_H > +#define C0VARIABLES_H > extern int gbl_init_extern; > extern int gbl_uninit_extern; > int gbl_tentative; > Index: gcc/testsuite/g++.dg/pph/x2nontrivinit.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x2nontrivinit.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x2nontrivinit.cc (working copy) > @@ -1 +0,0 @@ > -#include "x2nontrivinit.h" > Index: gcc/testsuite/g++.dg/pph/c0builtin-integral.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0builtin-integral.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0builtin-integral.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > +#ifndef C0BUILTIN_INTEGRAL_H > +#define C0BUILTIN_INTEGRAL_H > /* Copyright (C) 2004 Free Software Foundation. > > Verify that integral FP expressions are optimized. > Index: gcc/testsuite/g++.dg/pph/c0chained2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0chained2.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0chained2.h (working copy) > @@ -1,4 +1,4 @@ > -#ifndef C1CHAINED2_H > -#define C1CHAINED2_H > +#ifndef C0CHAINED2_H > +#define C0CHAINED2_H > #define TWO ONE > #endif > Index: gcc/testsuite/g++.dg/pph/d1unguarded.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/d1unguarded.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/d1unguarded.h (working copy) > @@ -1 +0,0 @@ > -extern int x; // { dg-error "header lacks guard for PPH" } > Index: gcc/testsuite/g++.dg/pph/x0globalref.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0globalref.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0globalref.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1GLOBALREF_H > -#define X1GLOBALREF_H > +#ifndef X0GLOBALREF_H > +#define X0GLOBALREF_H > typedef int type; > const type n = 3; > const type m = 4; > Index: gcc/testsuite/g++.dg/pph/c1builtin2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1builtin2.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c1builtin2.h (working copy) > @@ -1,6 +1,6 @@ > -#ifndef C2BUILTIN2_H > -#define C2BUILTIN2_H > -#include "c2builtin1.h" > +#ifndef C1BUILTIN2_H > +#define C1BUILTIN2_H > +#include "c0builtin1.h" > const char *file = VALUE(__FILE__); > const char *line = VALUE(__LINE__); > const char *vers = VALUE(__cplusplus); > Index: gcc/testsuite/g++.dg/pph/a0integer.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/a0integer.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/a0integer.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef A1INTEGER_H > -#define A1INTEGER_H > +#ifndef A0INTEGER_H > +#define A0INTEGER_H > > class integer > { > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn3c.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn3c.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn3c.hi (working copy) > @@ -1,3 +0,0 @@ > -template< typename T > > -void dynarray<T>::check(size_type n) > -{ if ( n >= count ) throw std::out_of_range("dynarray"); } > Index: gcc/testsuite/g++.dg/pph/c2builtin5.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2builtin5.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2builtin5.h (working copy) > @@ -1,9 +0,0 @@ > -#ifndef C2BUILTIN5_H > -#define C2BUILTIN5_H > -#include "a2builtin4.h" > -const char *file = VALUE(__FILE__); > -const char *line = VALUE(__LINE__); > -const char *vers = VALUE(__cplusplus); > -const char *optm = VALUE(__OPTIMIZE__); > -const char *func() { return __func__; } > -#endif > Index: gcc/testsuite/g++.dg/pph/x0special.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0special.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0special.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1SPECIAL_H > -#define X1SPECIAL_H > +#ifndef X0SPECIAL_H > +#define X0SPECIAL_H > > struct B { > B( int ); > Index: gcc/testsuite/g++.dg/pph/x1dynarray7.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray7.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray7.h (working copy) > @@ -1,32 +0,0 @@ > -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } > -// { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } > -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } > -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } > - > -#ifndef X1DYNARRAY7_H > -#define X1DYNARRAY7_H > - > -#include <stddef.h> > -#include <new> > -#include <memory> > -#include <stdexcept> > -#include <iterator> > - > -namespace tst { > - > -template< typename T > > -struct dynarray > -{ > - #include "a1dynarray-dcl1.hi" > - #include "a1dynarray-dcl2b.hi" > - #include "a1dynarray-dcl3.hi" > - #include "a1dynarray-dcl4.hi" > -}; > - > -#include "a1dynarray-dfn1b.hi" > -#include "a1dynarray-dfn2c.hi" > -#include "a1dynarray-dfn3c.hi" > - > -} // namespace tst > - > -#endif > Index: gcc/testsuite/g++.dg/pph/x7dynarray5.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x7dynarray5.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x7dynarray5.cc (working copy) > @@ -3,27 +3,27 @@ > // { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } > // { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } > > -#include "x1dynarray4.h" > -#include "x1dynarray5.h" > +#include "x0dynarray4.h" > +#include "x6dynarray5.h" > > #include <algorithm> > #include <iostream> > > -#include "a1integer.h" > +#include "a0integer.h" > typedef tst::dynarray< integer > integer_array; > > -#include "a1dynarray-hlp1.cci" > +#include "a0dynarray-hlp1.cci" > > int main() > { > - #include "a1dynarray-use1.cci" > + #include "a0dynarray-use1.cci" > dump( source ); > dump( sorted ); > std::sort( sorted.begin(), sorted.end() ); > dump( sorted ); > - #include "a1dynarray-use2.cci" > + #include "a0dynarray-use2.cci" > dump( target ); > - #include "a1dynarray-use3a.cci" > - #include "a1dynarray-use4a.cci" > + #include "a0dynarray-use3a.cci" > + #include "a0dynarray-use4a.cci" > return sum - 23; > } > Index: gcc/testsuite/g++.dg/pph/x0autometh.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0autometh.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0autometh.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1AUTOMETH_H > -#define X1AUTOMETH_H > +#ifndef X0AUTOMETH_H > +#define X0AUTOMETH_H > class base { > virtual int method() { > return 0; > Index: gcc/testsuite/g++.dg/pph/c1paste.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1paste.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c1paste.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "c2paste.h" > +#include "c0paste.h" > void foo_30_(int); > void bar(void) > { > Index: gcc/testsuite/g++.dg/pph/d2null.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/d2null.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/d2null.h (working copy) > @@ -1 +0,0 @@ > -// { dg-error "header lacks guard for PPH" } > Index: gcc/testsuite/g++.dg/pph/x1namespace.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1namespace.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1namespace.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "x1namespace.h" > +#include "x0namespace.h" > > namespace A { > int x = 3; > Index: gcc/testsuite/g++.dg/pph/c1field.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1field.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1field.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "c1field.h" > +#include "c0field.h" > struct client { > program field; > }; > Index: gcc/testsuite/g++.dg/pph/c2eabi1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2eabi1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2eabi1.h (working copy) > @@ -1,161 +0,0 @@ > -// { dg-options "-w -fpermissive" } > -// FIXME pph - Enabling PPH for this file causes memory problems in cc1plus. > -// c1eabi1.h c1eabi1.pph > - > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > - > -/* This file tests most of the non-C++ run-time helper functions > - described in Section 4 of the "Run-Time ABI for the ARM > - Architecture". These are basic tests; they do not try to validate > - all of the corner cases in these routines. > - > - The functions not tested here are: > - > - __aeabi_cdcmpeq > - __aeabi_cdcmple > - __aeabi_cdrcmple > - __aeabi_cfcmpeq > - __aeabi_cfcmple > - __aeabi_cfrcmple > - __aeabi_ldivmod > - __aeabi_uldivmod > - __aeabi_idivmod > - __aeabi_uidivmod > - > - These functions have non-standard calling conventions that would > - require the use of inline assembly to test. It would be good to > - add such tests, but they have not yet been implemented. > - > - There are also no tests for the "division by zero", "memory copying, > - clearing, and setting" functions. */ > - > -#include <stdio.h> > -#include <stdlib.h> > -#include <math.h> > - > -/* All these functions are defined to use the base ABI, so use the > - attribute to ensure the tests use the base ABI to call them even > - when the VFP ABI is otherwise in effect. */ > -#define PCS __attribute__((pcs("aapcs"))) > - > -#define decl_float(code, type) \ > - extern type __aeabi_ ## code ## add (type, type) PCS; \ > - extern type __aeabi_ ## code ## div (type, type) PCS; \ > - extern type __aeabi_ ## code ## mul (type, type) PCS; \ > - extern type __aeabi_ ## code ## neg (type) PCS; \ > - extern type __aeabi_ ## code ## rsub (type, type) PCS; \ > - extern type __aeabi_ ## code ## sub (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmpeq (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmplt (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmple (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmpge (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmpgt (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmpun (type, type) PCS; \ > - extern int __aeabi_ ## code ## 2iz (type) PCS; \ > - extern unsigned int __aeabi_ ## code ## 2uiz (type) PCS; \ > - extern long long __aeabi_ ## code ## 2lz (type) PCS; \ > - extern unsigned long long __aeabi_ ## code ## 2ulz (type) PCS; \ > - extern type __aeabi_i2 ## code (int) PCS; \ > - extern type __aeabi_ui2 ## code (int) PCS; \ > - extern type __aeabi_l2 ## code (long long) PCS; \ > - extern type __aeabi_ul2 ## code (unsigned long long) PCS; \ > - \ > - type code ## zero = 0.0; \ > - type code ## one = 1.0; \ > - type code ## two = 2.0; \ > - type code ## four = 4.0; \ > - type code ## minus_one = -1.0; \ > - type code ## minus_two = -2.0; \ > - type code ## minus_four = -4.0; \ > - type code ## epsilon = 1E-32; \ > - type code ## NaN = 0.0 / 0.0; > - > -decl_float (d, double) > -decl_float (f, float) > - > -extern float __aeabi_d2f (double) PCS; > -extern double __aeabi_f2d (float) PCS; > -extern long long __aeabi_lmul (long long, long long); > -extern long long __aeabi_llsl (long long, int); > -extern long long __aeabi_llsr (long long, int); > -extern long long __aeabi_lasr (long long, int); > -extern int __aeabi_lcmp (long long, long long); > -extern int __aeabi_ulcmp (unsigned long long, unsigned long long); > -extern int __aeabi_idiv (int, int); > -extern unsigned int __aeabi_uidiv (unsigned int, unsigned int); > -extern int __aeabi_uread4 (void *); > -extern int __aeabi_uwrite4 (int, void *); > -extern long long __aeabi_uread8 (void *); > -extern long long __aeabi_uwrite8 (long long, void *); > - > -#define eq(a, b, type, abs, epsilon, format) \ > - { \ > - type a1; \ > - type b1; \ > - \ > - a1 = a; \ > - b1 = b; \ > - if (abs (a1 - b1) > epsilon) \ > - { \ > - fprintf (stderr, "%d: Test %s == %s\n", __LINE__, #a, #b); \ > - fprintf (stderr, "%d: " format " != " format "\n", \ > - __LINE__, a1, b1); \ > - abort (); \ > - } \ > - } > - > -#define ieq(a, b) eq (a, b, int, abs, 0, "%d") > -#define ueq(a, b) eq (a, b, unsigned int, abs, 0, "%u") > -#define leq(a, b) eq (a, b, long long, abs, 0, "%lld") > -#define uleq(a, b) eq (a, b, unsigned long long, abs, 0, "%llu") > -#define feq(a, b) eq (a, b, float, fabs, fepsilon, "%f") > -#define deq(a, b) eq (a, b, double, fabs, depsilon, "%g") > - > -#define NUM_CMP_VALUES 6 > - > -/* Values picked to cover a range of small, large, positive and negative. */ > -static unsigned int cmp_val[NUM_CMP_VALUES] = > -{ > - 0, > - 1, > - 0x40000000, > - 0x80000000, > - 0xc0000000, > - 0xffffffff > -}; > - > -/* All combinations for each of the above values. */ > -#define ulcmp(l, s, m) \ > - s, l, l, l, l, l, m, s, l, l, l, l, \ > - m, m, s, l, l, l, m, m, m, s, l, l, \ > - m, m, m, m, s, l, m, m, m, m, m, s > - > -#define lcmp(l, s, m) \ > - s, l, l, m, m, m, m, s, l, m, m, m, \ > - m, m, s, m, m, m, l, l, l, s, l, l, \ > - l, l, l, m, s, l, l, l, l, m, m, s > - > -/* All combinations of the above for high/low words. */ > -static int lcmp_results[] = > -{ > - lcmp(ulcmp(-1, -1, -1), ulcmp(-1, 0, 1), ulcmp(1, 1, 1)) > -}; > - > -static int ulcmp_results[] = > -{ > - ulcmp(ulcmp(-1, -1, -1), ulcmp(-1, 0, 1), ulcmp(1, 1, 1)) > -}; > - > -static int signof(int i) > -{ > - if (i < 0) > - return -1; > - > - if (i == 0) > - return 0; > - > - return 1; > -} > - > -#endif > Index: gcc/testsuite/g++.dg/pph/c0struct.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0struct.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0struct.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef C1STRUCT_H > -#define C1STRUCT_H > +#ifndef C0STRUCT_H > +#define C0STRUCT_H > typedef int type; > type gbl = 1; > struct B { > Index: gcc/testsuite/g++.dg/pph/x2overload2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x2overload2.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x2overload2.h (working copy) > @@ -1,4 +0,0 @@ > -#ifndef X2OVERLOAD2_H > -#define X2OVERLOAD2_H > -int o(float x); > -#endif > Index: gcc/testsuite/g++.dg/pph/README > =================================================================== > --- gcc/testsuite/g++.dg/pph/README (revision 176187) > +++ gcc/testsuite/g++.dg/pph/README (working copy) > @@ -1,7 +1,8 @@ > The test names have the following convention on the prefix of their > names. > > - [acdpxy][12]* > + [acdpxy][0-9]* > + > a - auxillary headers > c - positive tests for c-level headers and sources > d - negative tests for c-level headers and sources > @@ -10,8 +11,22 @@ names. > tests. > x - C++-level positive tests. > y - C++-level negative tests. > - 1 - first priority feature tests > - 2 - second priority feature tests > + > + 0 - tests with no pph inclusions (usually headers) > + 1 - tests with a single leading pph file > + 2 - tests with a nested leading pph files > + 3 - tests non-leading pph files, but at most simple merging > + 4 - tests non-leading pph files, with significant merging > + > + 5 - tests with no pph inclusions plus C++stdlib merging > + 6 - tests with nested leading plus C++stdlib merging > + 7 - tests non-leading pph files plus C++stdlib merging > + > + 8 - tests for secondary diagnostic features we would like to have > + 9 - tests for tertiary diagnostic features we probably do not want > > These prefixes are in lexical order with respect to the compilations. > That is, you must pick names in the right place in the build. > + > +Tests labeled [567] are heavy iff the C++ standard library has been > +built with PPH. > Index: gcc/testsuite/g++.dg/pph/x1tmplclass.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1tmplclass.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1tmplclass.cc (working copy) > @@ -1,7 +1,7 @@ > // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } > -// { dg-bogus "x1tmplclass.h:14:5: error: specializing member .wrapper<char>::cache. requires .template<>. syntax" "" { xfail *-*-* } 0 } > +// { dg-bogus "x0tmplclass.h:14:5: error: specializing member .wrapper<char>::cache. requires .template<>. syntax" "" { xfail *-*-* } 0 } > > -#include "x1tmplclass.h" > +#include "x0tmplclass.h" > > int wrapper<char>::cache = 2; > > Index: gcc/testsuite/g++.dg/pph/x1tmplclass.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1tmplclass.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1tmplclass.h (working copy) > @@ -1,17 +0,0 @@ > -#ifndef X1TMPLCLASS_H > -#define X1TMPLCLASS_H > -template< typename T > > -struct wrapper { > - T value; > - static T cache; > -}; > - > -template< typename T > > -T wrapper<T>::cache = 3; > - > -template<> > -struct wrapper<char> { > - int value; > - static int cache; > -}; > -#endif > Index: gcc/testsuite/g++.dg/pph/c0pr44948-1a.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0pr44948-1a.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0pr44948-1a.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > +#ifndef C0PR44948_1A_H > +#define C0PR44948_1A_H > /* PR target/44948 */ > /* { dg-options "-O -Wno-psabi -mtune=generic" } */ > > Index: gcc/testsuite/g++.dg/pph/c0typerefs.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0typerefs.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0typerefs.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef C1TYPEREFS_H > -#define C1TYPEREFS_H > +#ifndef C0TYPEREFS_H > +#define C0TYPEREFS_H > struct base { > int field; > }; > Index: gcc/testsuite/g++.dg/pph/x6dynarray4.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x6dynarray4.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x6dynarray4.cc (working copy) > @@ -1,19 +1,19 @@ > // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } > // { dg-bogus "cstdlib:42:0: error: PPH file stdlib.pph fails macro validation, __STDDEF_H__" "" { xfail *-*-* } 0 } > > -#include "x1dynarray5.h" > +#include "x6dynarray5.h" > > #include <algorithm> > > -#include "a1integer.h" > +#include "a0integer.h" > typedef tst::dynarray< integer > integer_array; > > int main() > { > - #include "a1dynarray-use1.cci" > + #include "a0dynarray-use1.cci" > std::sort( sorted.begin(), sorted.end() ); > - #include "a1dynarray-use2.cci" > - #include "a1dynarray-use3a.cci" > - #include "a1dynarray-use4a.cci" > + #include "a0dynarray-use2.cci" > + #include "a0dynarray-use3a.cci" > + #include "a0dynarray-use4a.cci" > return sum - 23; > } > Index: gcc/testsuite/g++.dg/pph/x1nontrivinit.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1nontrivinit.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x1nontrivinit.cc (working copy) > @@ -1 +1 @@ > -#include "x2nontrivinit.h" > +#include "x0nontrivinit.h" > Index: gcc/testsuite/g++.dg/pph/c1functions.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1functions.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1functions.h (working copy) > @@ -1,5 +0,0 @@ > -#ifndef C1FUNCTIONS_H > -#define C1FUNCTIONS_H > -extern int extern_only(int); // > -extern int extern_then_body(int); // > -#endif > Index: gcc/testsuite/g++.dg/pph/c0builtin-objsize.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0builtin-objsize.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0builtin-objsize.h (working copy) > @@ -1,7 +1,8 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > /* { dg-options "-w -fpermissive" } */ > > +#ifndef C0BUILTIN_OBJSIZE_H > +#define C0BUILTIN_OBJSIZE_H > + > typedef __SIZE_TYPE__ size_t; > extern void abort (void); > extern void exit (int); > Index: gcc/testsuite/g++.dg/pph/c1-20060625-1.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1-20060625-1.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c1-20060625-1.cc (working copy) > @@ -1 +1 @@ > -#include "c120060625-1.h" > +#include "c0-20060625-1.h" > Index: gcc/testsuite/g++.dg/pph/x1typerefs.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1typerefs.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1typerefs.cc (working copy) > @@ -1,7 +0,0 @@ > -#include "x1typerefs.h" > - > -int derived::method() { > - return field; > -} > - > -vderived variable; > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn1a.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn1a.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn1a.hi (working copy) > @@ -1,8 +0,0 @@ > -template< typename T > > -dynarray<T>::dynarray(size_type c) > -: store( alloc( c ) ), count( c ) > -{ } > - > -template< typename T > > -dynarray<T>::~dynarray() > -{ delete[] store; } > Index: gcc/testsuite/g++.dg/pph/c1builtin3.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1builtin3.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c1builtin3.h (working copy) > @@ -1,6 +1,6 @@ > -#ifndef C2BUILTIN3_H > -#define C2BUILTIN3_H > -#include "c2builtin1.h" > +#ifndef C1BUILTIN3_H > +#define C1BUILTIN3_H > +#include "c0builtin1.h" > const char *refile = VALUE(__FILE__); > const char *reline = VALUE(__LINE__); > #endif > Index: gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.cc (working copy) > @@ -1,3 +0,0 @@ > -/* { dg-options "-w" } */ > -// pph asm xdiff > -#include "c1attr-warn-unused-result.h" > Index: gcc/testsuite/g++.dg/pph/p1mean.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/p1mean.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/p1mean.cc (working copy) > @@ -1,165 +0,0 @@ > -// { dg-timeout 2 { target *-*-* } } > -// { dg-xfail-if "INFINITE" { "*-*-*" } { "-fpph-map=pph.map" } } > - > -#include <stdlib.h> > -#include <stdio.h> > -#include <math.h> > -#include <string.h> > - > -static unsigned long long MAX_ITEMS = 10000; > - > -static int > -cmpdouble (const void *p1, const void *p2) > -{ > - double n1 = *((double *)p1); > - double n2 = *((double *)p2); > - > - if (n1 < n2) > - return -1; > - else if (n1 > n2) > - return 1; > - else > - return 0; > -} > - > - > -double > -compute_median (int n, double vec[]) > -{ > - qsort (vec, n, sizeof (double), cmpdouble); > - > - if (n % 2 == 0) > - return ((vec[n / 2] + vec[n / 2 - 1]) / 2.0); > - else > - return vec[n / 2]; > -} > - > -double > -compute_stddev (int n, double avg, double vec[]) > -{ > - double sd, sum, s, x; > - int i; > - > - for (x = 0.0, sum = 0.0, i = 0; i < n; i++) > - { > - double d; > - > - x = x + vec[i]; > - d = vec[i] - avg; > - sum += d * d; > - } > - > - s = sum / n; > - sd = sqrt (s); > - > - return sd; > -} > - > - > -int > -main (int argc, char *argv[]) > -{ > - double *vec; > - double x, sum, product, inverse_sum, arithmetic, geometric, harmonic; > - double min, max, median, variance, stddev; > - int count; > - int ret; > - > - sum = 0.0; > - product = 1.0; > - inverse_sum = 0.0; > - count = 0; > - min = 0.0; > - max = 0.0; > - > - vec = (double *) malloc (MAX_ITEMS * sizeof (double)); > - > - while (1) > - { > - ret = scanf ("%lg", &x); > - if (ret == EOF) > - break; > - > - if (count == 0) > - min = max = x; > - > - if (x < min) > - min = x; > - > - if (x > max) > - max = x; > - > - sum += x; > - product *= x; > - inverse_sum += 1.0 / x; > - vec[count] = x; > - > - count++; > - if (count >= MAX_ITEMS) > - { > - MAX_ITEMS *= 3; > - vec = (double *) realloc (vec, MAX_ITEMS * sizeof (double)); > - } > - } > - > - int do_min = (strstr (argv[0], "min") != NULL); > - int do_max = (strstr (argv[0], "max") != NULL); > - int do_avg = (strstr (argv[0], "avg") != NULL); > - int do_geo = (strstr (argv[0], "geoavg") != NULL); > - int do_harmonic = (strstr (argv[0], "harmonic") != NULL); > - int do_median = (strstr (argv[0], "median") != NULL); > - int do_variance = (strstr (argv[0], "variance") != NULL); > - int do_stdev = (strstr (argv[0], "stdev") != NULL); > - int do_all = (argc > 1 && strcmp (argv[1], "-a") == 0); > - > - if (count > 0) > - { > - arithmetic = sum / count; > - geometric = pow (product, (double) 1.0 / (double) count); > - harmonic = count / inverse_sum; > - median = compute_median (count, vec); > - stddev = compute_stddev (count, arithmetic, vec); > - variance = stddev * stddev; > - > - if (do_all) > - { > - printf ("# of items read --> %d\n", count); > - printf ("Min --------------> %lg\n", min); > - printf ("Max --------------> %lg\n", max); > - printf ("Arithmetic mean --> %lg\n", arithmetic); > - printf ("Geometric mean ---> %lg\n", geometric); > - printf ("Harmonic mean ----> %lg\n", harmonic); > - printf ("Median -----------> %lg\n", median); > - printf ("Variance ---------> %lg\n", variance); > - printf ("Standard dev -----> %lg\n", stddev); > - } > - else if (do_min) > - printf ("%lg\n", min); > - else if (do_max) > - printf ("%lg\n", max); > - else if (do_avg) > - printf ("%lg\n", arithmetic); > - else if (do_geo) > - printf ("%lg\n", geometric); > - else if (do_harmonic) > - printf ("%lg\n", harmonic); > - else if (do_median) > - printf ("%lg\n", median); > - else if (do_variance) > - printf ("%lg\n", variance); > - else if (do_stdev) > - printf ("%lg\n", stddev); > - else > - { > - fprintf (stderr, "ERROR: Unknown value '%s' to compute\n", argv[0]); > - return 1; > - } > - } > - else > - { > - fprintf (stderr, "ERROR: none of the input is positive\n"); > - return 1; > - } > - > - return 0; > -} > Index: gcc/testsuite/g++.dg/pph/c1limits-externalid.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1limits-externalid.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1limits-externalid.cc (working copy) > @@ -1 +1 @@ > -#include "c1limits-externalid.h" > +#include "c0limits-externalid.h" > Index: gcc/testsuite/g++.dg/pph/c1multinc1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1multinc1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1multinc1.h (working copy) > @@ -1,4 +0,0 @@ > -#ifndef C1MULTINC1_H > -#define C1MULTINC1_H > -extern float f1; > -#endif > Index: gcc/testsuite/g++.dg/pph/c2builtin6.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2builtin6.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2builtin6.h (working copy) > @@ -1,6 +0,0 @@ > -#ifndef C2BUILTIN6_H > -#define C2BUILTIN6_H > -#include "a2builtin4.h" > -const char *refile = VALUE(__FILE__); > -const char *reline = VALUE(__LINE__); > -#endif > Index: gcc/testsuite/g++.dg/pph/c1empty.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1empty.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1empty.h (working copy) > @@ -1,3 +0,0 @@ > -#ifndef C1EMPTY_H > -#define C1EMPTY_H > -#endif > Index: gcc/testsuite/g++.dg/pph/x1dynarray3.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray3.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray3.cc (working copy) > @@ -1,15 +0,0 @@ > -// { dg-do run } > - > -#include "x1dynarray3.h" > - > -#include "a1integer.h" > -typedef tst::dynarray< integer > integer_array; > - > -int main() > -{ > - #include "a1dynarray-use1.cci" > - #include "a1dynarray-use2.cci" > - #include "a1dynarray-use3a.cci" > - #include "a1dynarray-use4a.cci" > - return sum - 25; > -} > Index: gcc/testsuite/g++.dg/pph/x1ten-hellos.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1ten-hellos.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1ten-hellos.h (working copy) > @@ -1,25 +0,0 @@ > -#ifndef A_H_ > -#define A_H_ > -extern "C" { > - int printf(const char*, ...); > - void abort(void); > - void exit(int); > -}; > - > -class A > -{ > -public: > - A() { > - x_ = 0; > - printf ("constructing\n"); > - } > - > - void hello(void) { > - x_++; > - printf ("Hello World (%d)\n", x_); > - } > - > -private: > - int x_; > -}; > -#endif > Index: gcc/testsuite/g++.dg/pph/c1funcstatic.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1funcstatic.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1funcstatic.cc (working copy) > @@ -1,2 +1,2 @@ > -#include "c1funcstatic.h" > +#include "c0funcstatic.h" > int g() { return f(); } > Index: gcc/testsuite/g++.dg/pph/c1functions.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1functions.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1functions.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "c1functions.h" > +#include "c0functions.h" > int extern_then_body(int i) // need body, merge head to body > { return extern_only( i ); } > static int fwdref_static(int); > Index: gcc/testsuite/g++.dg/pph/c1multinc.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1multinc.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1multinc.cc (working copy) > @@ -1,5 +0,0 @@ > -#include "c1multinc2.h" > -void foo (void) > -{ > - int x = var1 + var2 - (int) f1; > -} > Index: gcc/testsuite/g++.dg/pph/a1dynarray-use3b.cci > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-use3b.cci (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-use3b.cci (working copy) > @@ -1,8 +0,0 @@ > - try { > - integer t = target.at(32); > - } > - catch ( std::out_of_range ) { > - } > - catch ( ... ) { > - return 1; > - } > Index: gcc/testsuite/g++.dg/pph/c2paste.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2paste.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2paste.h (working copy) > @@ -1,5 +0,0 @@ > -#ifndef C2PASTE_H > -#define C2PASTE_H > -#define major "beef" > -#define M(major) foo##_##major##_(major) > -#endif > Index: gcc/testsuite/g++.dg/pph/c0eabi1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0eabi1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0eabi1.h (working copy) > @@ -2,8 +2,8 @@ > // FIXME pph - Enabling PPH for this file causes memory problems in cc1plus. > // c1eabi1.h c1eabi1.pph > > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > +#ifndef C0EABI1_H > +#define C0EABI1_H > > /* This file tests most of the non-C++ run-time helper functions > described in Section 4 of the "Run-Time ABI for the ARM > @@ -30,9 +30,9 @@ > There are also no tests for the "division by zero", "memory copying, > clearing, and setting" functions. */ > > -/* Simplified version of c2eabi1.cc - Do not include other system > - headers here. Simply forward declare the library functions used > - by this header. */ > +/* Simplified version of c2eabi1.cc > + - Do not include other system headers here. > + Simply forward declare the library functions used by this header. */ > extern "C" { > extern void abort(void); > extern int abs(int); > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dcl1.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dcl1.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dcl1.hi (working copy) > @@ -1,6 +0,0 @@ > - // parameter-based types: > - typedef T value_type; > - typedef T& reference; > - typedef const T& const_reference; > - typedef T* iterator; > - typedef const T* const_iterator; > Index: gcc/testsuite/g++.dg/pph/x2overload3.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x2overload3.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x2overload3.h (working copy) > @@ -1,9 +0,0 @@ > -#ifndef X2OVERLOAD3_H > -#define X2OVERLOAD3_H > -#include "x2overload1.h" > -inline int f() > -{ > - float x = 2.3f; > - return o(x); > -} > -#endif > Index: gcc/testsuite/g++.dg/pph/x1typerefs.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1typerefs.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1typerefs.h (working copy) > @@ -1,6 +1,6 @@ > #ifndef X1TYPEREFS_H > #define X1TYPEREFS_H > -#include "c1typerefs.h" > +#include "c0typerefs.h" > struct derived : base { > int method(); > }; > Index: gcc/testsuite/g++.dg/pph/c1pr44948-1a.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1pr44948-1a.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1pr44948-1a.cc (working copy) > @@ -1,3 +1,3 @@ > // { dg-xfail-if "INFINITE" { "*-*-*" } { "-fpph-map=pph.map" } } > // { dg-bogus "internal compiler error: in lto_streamer_cache_get, at lto-streamer.c" "" { xfail *-*-* } 0 } > -#include "c1pr44948-1a.h" > +#include "c0pr44948-1a.h" > Index: gcc/testsuite/g++.dg/pph/x1hardlookup.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1hardlookup.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1hardlookup.h (working copy) > @@ -1,18 +0,0 @@ > -#ifndef X1HARDLOOKUP_H > -#define X1HARDLOOKUP_H > -struct V { int a; static int b;}; > -namespace N { > - int V; > - struct C { }; > - int operator + (int i, C c); > - C O; > - int I(int arg) > - { return arg + V; } > - struct V w; > - int x = V::b; > -} > - > -int V; > -struct D { }; > -int operator + (int i, D d); > -#endif > Index: gcc/testsuite/g++.dg/pph/c120060625-1.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c120060625-1.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c120060625-1.cc (working copy) > @@ -1 +0,0 @@ > -#include "c120060625-1.h" > Index: gcc/testsuite/g++.dg/pph/c1builtin-integral.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1builtin-integral.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c1builtin-integral.cc (working copy) > @@ -1,2 +1,2 @@ > // pph asm xdiff > -#include "c1builtin-integral-1.h" > +#include "c0builtin-integral.h" > Index: gcc/testsuite/g++.dg/pph/x0nontrivinit.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0nontrivinit.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0nontrivinit.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X2NONTRIVINIT_H > -#define X2NONTRIVINIT_H > +#ifndef X0NONTRIVINIT_H > +#define X0NONTRIVINIT_H > int y = 0; > int x = y+1; > #endif > Index: gcc/testsuite/g++.dg/pph/x7dynarray6.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x7dynarray6.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x7dynarray6.cc (working copy) > @@ -6,23 +6,23 @@ > #include <algorithm> > #include <iostream> > > -#include "x1dynarray6.h" > +#include "x6dynarray6.h" > > -#include "a1integer.h" > +#include "a0integer.h" > typedef tst::dynarray< integer > integer_array; > > -#include "a1dynarray-hlp1.cci" > +#include "a0dynarray-hlp1.cci" > > int main() > { > - #include "a1dynarray-use1.cci" > + #include "a0dynarray-use1.cci" > dump( source ); > dump( sorted ); > std::sort( sorted.begin(), sorted.end() ); > dump( sorted ); > - #include "a1dynarray-use2.cci" > + #include "a0dynarray-use2.cci" > dump( target ); > - #include "a1dynarray-use3b.cci" > - #include "a1dynarray-use4a.cci" > + #include "a0dynarray-use3b.cci" > + #include "a0dynarray-use4a.cci" > return sum - 23; > } > Index: gcc/testsuite/g++.dg/pph/x6dynarray5.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x6dynarray5.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x6dynarray5.h (working copy) > @@ -1,16 +1,16 @@ > -#ifndef X1DYNARRAY5_H > -#define X1DYNARRAY5_H > +#ifndef X6DYNARRAY5_H > +#define X6DYNARRAY5_H > > -#include "x1dynarray4.h" > +#include "x0dynarray4.h" > > #include <new> > #include <memory> > > namespace tst { > > -#include "a1dynarray-dfn1b.hi" > -#include "a1dynarray-dfn2c.hi" > -#include "a1dynarray-dfn3b.hi" > +#include "a0dynarray-dfn1b.hi" > +#include "a0dynarray-dfn2c.hi" > +#include "a0dynarray-dfn3b.hi" > > } // namespace tst > > Index: gcc/testsuite/g++.dg/pph/a1dynarray-use4a.cci > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-use4a.cci (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-use4a.cci (working copy) > @@ -1,5 +0,0 @@ > - int sum = 0; > - for ( integer_array::iterator it = target.begin(); > - it != target.end(); > - ++it ) > - sum += *it; > Index: gcc/testsuite/g++.dg/pph/c1eabi1.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1eabi1.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1eabi1.cc (working copy) > @@ -1,7 +1,6 @@ > // { dg-options "-w -fpermissive" } > -// pph asm xdiff > > -#include "c1eabi1.h" > +#include "c0eabi1.h" > > int main () { > unsigned char bytes[256]; > Index: gcc/testsuite/g++.dg/pph/c0varorder.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0varorder.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0varorder.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef __C1VARORDER_H > -#define __C1VARORDER_H > +#ifndef C0VARORDER_H > +#define C0VARORDER_H > > int var1; > int var2; > Index: gcc/testsuite/g++.dg/pph/c0builtin1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0builtin1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0builtin1.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef C2BUILTIN1_H > -#define C2BUILTIN1_H > +#ifndef C0BUILTIN1_H > +#define C0BUILTIN1_H > #define QUOTE(arg) #arg > #define VALUE(arg) QUOTE(arg) > #endif > Index: gcc/testsuite/g++.dg/pph/c3builtin1.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c3builtin1.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c3builtin1.cc (working copy) > @@ -1,3 +1,3 @@ > -#include "c2builtin1.h" > -#include "c2builtin2.h" > -#include "c2builtin3.h" > +#include "c0builtin1.h" > +#include "c1builtin2.h" > +#include "c1builtin3.h" > Index: gcc/testsuite/g++.dg/pph/c0dupguard1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0dupguard1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0dupguard1.h (working copy) > @@ -1,4 +1,4 @@ > -#ifndef C2DUPGUARD_H > -#define C2DUPGUARD_H > +#ifndef C0DUPGUARD_H > +#define C0DUPGUARD_H > extern int x; > #endif > Index: gcc/testsuite/g++.dg/pph/x1functions.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1functions.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1functions.cc (working copy) > @@ -1,9 +0,0 @@ > -// pph asm xdiff > - > -#include "x1functions.h" > - > -int type::mbr_decl_then_def(int i) // need body > -{ return mbr_decl_inline( i ); } > - > -int type::mbr_inl_then_def(int i) // lazy body > -{ return mbr_decl_then_def( i ); } > Index: gcc/testsuite/g++.dg/pph/c1multinc2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1multinc2.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1multinc2.h (working copy) > @@ -1,8 +0,0 @@ > -#ifndef C1MULTINC2 > -#define C1MULTINC2 > -#include "c1altinc1.h" > -extern void foo (void); > -extern int var1; > -extern int var2; > -#include "c1altinc1.h" > -#endif > Index: gcc/testsuite/g++.dg/pph/x1dynarray1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray1.h (working copy) > @@ -1,19 +0,0 @@ > -#ifndef X1DYNARRAY1_H > -#define X1DYNARRAY1_H > - > -extern "C" void *memcpy(void *dest, const void *src, unsigned long n); > -extern "C" void exit(int) throw(); > - > -template< typename T > > -struct dynarray > -{ > - #include "a1dynarray-dcl1.hi" > - #include "a1dynarray-dcl2a.hi" > - #include "a1dynarray-dcl3.hi" > -}; > - > -#include "a1dynarray-dfn1a.hi" > -#include "a1dynarray-dfn2a.hi" > -#include "a1dynarray-dfn3a.hi" > - > -#endif > Index: gcc/testsuite/g++.dg/pph/x5dynarray3.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x5dynarray3.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x5dynarray3.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1DYNARRAY3_H > -#define X1DYNARRAY3_H > +#ifndef X5DYNARRAY3_H > +#define X5DYNARRAY3_H > > #include <stddef.h> > #include <new> > @@ -9,14 +9,14 @@ namespace tst { > template< typename T > > struct dynarray > { > - #include "a1dynarray-dcl1.hi" > - #include "a1dynarray-dcl2b.hi" > - #include "a1dynarray-dcl3.hi" > + #include "a0dynarray-dcl1.hi" > + #include "a0dynarray-dcl2b.hi" > + #include "a0dynarray-dcl3.hi" > }; > > -#include "a1dynarray-dfn1b.hi" > -#include "a1dynarray-dfn2b.hi" > -#include "a1dynarray-dfn3b.hi" > +#include "a0dynarray-dfn1b.hi" > +#include "a0dynarray-dfn2b.hi" > +#include "a0dynarray-dfn3b.hi" > > } // namespace tst > > Index: gcc/testsuite/g++.dg/pph/c1builtin-objsize.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1builtin-objsize.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c1builtin-objsize.cc (working copy) > @@ -1,2 +1,2 @@ > /* { dg-options "-O2 -w -fpermissive" } */ > -#include "c1builtin-object-size-2.h" > +#include "c0builtin-objsize.h" > Index: gcc/testsuite/g++.dg/pph/c0paste.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0paste.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0paste.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef C2PASTE_H > -#define C2PASTE_H > +#ifndef C0PASTE_H > +#define C0PASTE_H > #define major "beef" > #define M(major) foo##_##major##_(major) > #endif > Index: gcc/testsuite/g++.dg/pph/c0return-5.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0return-5.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0return-5.h (working copy) > @@ -1,7 +1,7 @@ > // { dg-options "-mpreferred-stack-boundary=4" } > > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > +#ifndef C0RETURN_5_H > +#define C0RETURN_5_H > > /* This compile only test is to detect an assertion failure in stack branch > development. */ > Index: gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.h (working copy) > @@ -1,395 +0,0 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > -/* { dg-options "-w -fpermissive" } */ > - > -typedef __SIZE_TYPE__ size_t; > -extern void abort (void); > -extern void exit (int); > -extern void *malloc (size_t); > -extern void *calloc (size_t, size_t); > -extern void *alloca (size_t); > -extern void *memcpy (void *, const void *, size_t); > -extern void *memset (void *, int, size_t); > -extern char *strcpy (char *, const char *); > - > -struct A > -{ > - char a[10]; > - int b; > - char c[10]; > -} y, w[4]; > - > -extern char exta[]; > -extern char extb[30]; > -extern struct A extc[]; > -struct A zerol[0]; > - > -void > -__attribute__ ((noinline)) > -test1 (void *q, int x) > -{ > - struct A a; > - void *p = &a.a[3], *r; > - char var[x + 10]; > - struct A vara[x + 10]; > - if (x < 0) > - r = &a.a[9]; > - else > - r = &a.c[1]; > - if (__builtin_object_size (p, 1) != sizeof (a.a) - 3) > - abort (); > - if (__builtin_object_size (&a.c[9], 1) > - != sizeof (a.c) - 9) > - abort (); > - if (__builtin_object_size (q, 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (r, 1) != sizeof (a.c) - 1) > - abort (); > - if (x < 6) > - r = &w[2].a[1]; > - else > - r = &a.a[6]; > - if (__builtin_object_size (&y, 1) != sizeof (y)) > - abort (); > - if (__builtin_object_size (w, 1) != sizeof (w)) > - abort (); > - if (__builtin_object_size (&y.b, 1) != sizeof (a.b)) > - abort (); > - if (__builtin_object_size (r, 1) != sizeof (a.a) - 1) > - abort (); > - if (x < 20) > - r = malloc (30); > - else > - r = calloc (2, 16); > - if (__builtin_object_size (r, 1) != 2 * 16) > - abort (); > - if (x < 20) > - r = malloc (30); > - else > - r = calloc (2, 14); > - if (__builtin_object_size (r, 1) != 30) > - abort (); > - if (x < 30) > - r = malloc (sizeof (a)); > - else > - r = &a.a[3]; > - if (__builtin_object_size (r, 1) != sizeof (a)) > - abort (); > - r = memcpy (r, "a", 2); > - if (__builtin_object_size (r, 1) != sizeof (a)) > - abort (); > - r = memcpy (r + 2, "b", 2) + 2; > - if (__builtin_object_size (r, 1) != sizeof (a) - 4) > - abort (); > - r = &a.a[4]; > - r = memset (r, 'a', 2); > - if (__builtin_object_size (r, 1) != sizeof (a.a) - 4) > - abort (); > - r = memset (r + 2, 'b', 2) + 2; > - if (__builtin_object_size (r, 1) != sizeof (a.a) - 8) > - abort (); > - r = &a.a[1]; > - r = strcpy (r, "ab"); > - if (__builtin_object_size (r, 1) != sizeof (a.a) - 1) > - abort (); > - r = strcpy (r + 2, "cd") + 2; > - if (__builtin_object_size (r, 1) != sizeof (a.a) - 5) > - abort (); > - if (__builtin_object_size (exta, 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (exta + 10, 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (&exta[5], 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (extb, 1) != sizeof (extb)) > - abort (); > - if (__builtin_object_size (extb + 10, 1) != sizeof (extb) - 10) > - abort (); > - if (__builtin_object_size (&extb[5], 1) != sizeof (extb) - 5) > - abort (); > - if (__builtin_object_size (extc, 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (extc + 10, 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (&extc[5], 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (&extc->a, 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (&(extc + 10)->b, 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (&extc[5].c[3], 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (var, 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (var + 10, 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (&var[5], 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (vara, 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (vara + 10, 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (&vara[5], 1) != (size_t) -1) > - abort (); > - if (__builtin_object_size (&vara[0].a, 1) != sizeof (vara[0].a)) > - abort (); > - if (__builtin_object_size (&vara[10].a[0], 1) != sizeof (vara[0].a)) > - abort (); > - if (__builtin_object_size (&vara[5].a[4], 1) != sizeof (vara[0].a) - 4) > - abort (); > - if (__builtin_object_size (&vara[5].b, 1) != sizeof (vara[0].b)) > - abort (); > - if (__builtin_object_size (&vara[7].c[7], 1) != sizeof (vara[0].c) - 7) > - abort (); > - if (__builtin_object_size (zerol, 1) != 0) > - abort (); > - if (__builtin_object_size (&zerol, 1) != 0) > - abort (); > - if (__builtin_object_size (&zerol[0], 1) != 0) > - abort (); > - if (__builtin_object_size (zerol[0].a, 1) != 0) > - abort (); > - if (__builtin_object_size (&zerol[0].a[0], 1) != 0) > - abort (); > - if (__builtin_object_size (&zerol[0].b, 1) != 0) > - abort (); > - if (__builtin_object_size ("abcdefg", 1) != sizeof ("abcdefg")) > - abort (); > - if (__builtin_object_size ("abcd\0efg", 1) != sizeof ("abcd\0efg")) > - abort (); > - if (__builtin_object_size (&"abcd\0efg", 1) != sizeof ("abcd\0efg")) > - abort (); > - if (__builtin_object_size (&"abcd\0efg"[0], 1) != sizeof ("abcd\0efg")) > - abort (); > - if (__builtin_object_size (&"abcd\0efg"[4], 1) != sizeof ("abcd\0efg") - 4) > - abort (); > - if (__builtin_object_size ("abcd\0efg" + 5, 1) != sizeof ("abcd\0efg") - 5) > - abort (); > - if (__builtin_object_size (L"abcdefg", 1) != sizeof (L"abcdefg")) > - abort (); > - r = (char *) L"abcd\0efg"; > - if (__builtin_object_size (r + 2, 1) != sizeof (L"abcd\0efg") - 2) > - abort (); > -} > - > -size_t l1 = 1; > - > -void > -__attribute__ ((noinline)) > -test2 (void) > -{ > - struct B { char buf1[10]; char buf2[10]; } a; > - char *r, buf3[20]; > - int i; > - > - if (sizeof (a) != 20) > - return; > - > - r = buf3; > - for (i = 0; i < 4; ++i) > - { > - if (i == l1 - 1) > - r = &a.buf1[1]; > - else if (i == l1) > - r = &a.buf2[7]; > - else if (i == l1 + 1) > - r = &buf3[5]; > - else if (i == l1 + 2) > - r = &a.buf1[9]; > - } > - if (__builtin_object_size (r, 1) != sizeof (buf3)) > - abort (); > - r = &buf3[20]; > - for (i = 0; i < 4; ++i) > - { > - if (i == l1 - 1) > - r = &a.buf1[7]; > - else if (i == l1) > - r = &a.buf2[7]; > - else if (i == l1 + 1) > - r = &buf3[5]; > - else if (i == l1 + 2) > - r = &a.buf1[9]; > - } > - if (__builtin_object_size (r, 1) != sizeof (buf3) - 5) > - abort (); > - r += 8; > - if (__builtin_object_size (r, 1) != sizeof (buf3) - 13) > - abort (); > - if (__builtin_object_size (r + 6, 1) != sizeof (buf3) - 19) > - abort (); > -} > - > -void > -__attribute__ ((noinline)) > -test3 (void) > -{ > - char buf4[10]; > - struct B { struct A a[2]; struct A b; char c[4]; char d; double e; > - _Complex double f; } x; > - double y; > - _Complex double z; > - double *dp; > - > - if (__builtin_object_size (buf4, 1) != sizeof (buf4)) > - abort (); > - if (__builtin_object_size (&buf4, 1) != sizeof (buf4)) > - abort (); > - if (__builtin_object_size (&buf4[0], 1) != sizeof (buf4)) > - abort (); > - if (__builtin_object_size (&buf4[1], 1) != sizeof (buf4) - 1) > - abort (); > - if (__builtin_object_size (&x, 1) != sizeof (x)) > - abort (); > - if (__builtin_object_size (&x.a, 1) != sizeof (x.a)) > - abort (); > - if (__builtin_object_size (&x.a[0], 1) != sizeof (x.a)) > - abort (); > - if (__builtin_object_size (&x.a[0].a, 1) != sizeof (x.a[0].a)) > - abort (); > - if (__builtin_object_size (&x.a[0].a[0], 1) != sizeof (x.a[0].a)) > - abort (); > - if (__builtin_object_size (&x.a[0].a[3], 1) != sizeof (x.a[0].a) - 3) > - abort (); > - if (__builtin_object_size (&x.a[0].b, 1) != sizeof (x.a[0].b)) > - abort (); > - if (__builtin_object_size (&x.a[1].c, 1) != sizeof (x.a[1].c)) > - abort (); > - if (__builtin_object_size (&x.a[1].c[0], 1) != sizeof (x.a[1].c)) > - abort (); > - if (__builtin_object_size (&x.a[1].c[3], 1) != sizeof (x.a[1].c) - 3) > - abort (); > - if (__builtin_object_size (&x.b, 1) != sizeof (x.b)) > - abort (); > - if (__builtin_object_size (&x.b.a, 1) != sizeof (x.b.a)) > - abort (); > - if (__builtin_object_size (&x.b.a[0], 1) != sizeof (x.b.a)) > - abort (); > - if (__builtin_object_size (&x.b.a[3], 1) != sizeof (x.b.a) - 3) > - abort (); > - if (__builtin_object_size (&x.b.b, 1) != sizeof (x.b.b)) > - abort (); > - if (__builtin_object_size (&x.b.c, 1) != sizeof (x.b.c)) > - abort (); > - if (__builtin_object_size (&x.b.c[0], 1) != sizeof (x.b.c)) > - abort (); > - if (__builtin_object_size (&x.b.c[3], 1) != sizeof (x.b.c) - 3) > - abort (); > - if (__builtin_object_size (&x.c, 1) != sizeof (x.c)) > - abort (); > - if (__builtin_object_size (&x.c[0], 1) != sizeof (x.c)) > - abort (); > - if (__builtin_object_size (&x.c[1], 1) != sizeof (x.c) - 1) > - abort (); > - if (__builtin_object_size (&x.d, 1) != sizeof (x.d)) > - abort (); > - if (__builtin_object_size (&x.e, 1) != sizeof (x.e)) > - abort (); > - if (__builtin_object_size (&x.f, 1) != sizeof (x.f)) > - abort (); > - dp = &__real__ x.f; > - if (__builtin_object_size (dp, 1) != sizeof (x.f) / 2) > - abort (); > - dp = &__imag__ x.f; > - if (__builtin_object_size (dp, 1) != sizeof (x.f) / 2) > - abort (); > - dp = &y; > - if (__builtin_object_size (dp, 1) != sizeof (y)) > - abort (); > - if (__builtin_object_size (&z, 1) != sizeof (z)) > - abort (); > - dp = &__real__ z; > - if (__builtin_object_size (dp, 1) != sizeof (z) / 2) > - abort (); > - dp = &__imag__ z; > - if (__builtin_object_size (dp, 1) != sizeof (z) / 2) > - abort (); > -} > - > -struct S { unsigned int a; }; > - > -char * > -__attribute__ ((noinline)) > -test4 (char *x, int y) > -{ > - register int i; > - struct A *p; > - > - for (i = 0; i < y; i++) > - { > - p = (struct A *) x; > - x = (char *) &p[1]; > - if (__builtin_object_size (p, 1) != (size_t) -1) > - abort (); > - } > - return x; > -} > - > -void > -__attribute__ ((noinline)) > -test5 (size_t x) > -{ > - struct T { char buf[64]; char buf2[64]; } t; > - char *p = &t.buf[8]; > - size_t i; > - > - for (i = 0; i < x; ++i) > - p = p + 4; > - if (__builtin_object_size (p, 1) != sizeof (t.buf) - 8) > - abort (); > - memset (p, ' ', sizeof (t.buf) - 8 - 4 * 4); > -} > - > -void > -__attribute__ ((noinline)) > -test6 (void) > -{ > - char buf[64]; > - struct T { char buf[64]; char buf2[64]; } t; > - char *p = &buf[64], *q = &t.buf[64]; > - > - if (__builtin_object_size (p + 64, 1) != 0) > - abort (); > - if (__builtin_object_size (q + 0, 1) != 0) > - abort (); > - if (__builtin_object_size (q + 64, 1) != 0) > - abort (); > -} > - > -void > -__attribute__ ((noinline)) > -test7 (void) > -{ > - struct T { char buf[10]; char buf2[10]; } t; > - char *p = &t.buf2[-4]; > - char *q = &t.buf2[0]; > - if (__builtin_object_size (p, 1) != 0) > - abort (); > - if (__builtin_object_size (q, 1) != sizeof (t.buf2)) > - abort (); > - q = &t.buf[10]; > - if (__builtin_object_size (q, 1) != 0) > - abort (); > - q = &t.buf[11]; > - if (__builtin_object_size (q, 1) != 0) > - abort (); > - p = &t.buf[-4]; > - if (__builtin_object_size (p, 1) != 0) > - abort (); > -} > - > -int > -main (void) > -{ > - struct S s[10]; > - __asm ("" : "=r" (l1) : "0" (l1)); > - test1 (main, 6); > - test2 (); > - test3 (); > - test4 ((char *) s, 10); > - test5 (4); > - test6 (); > - test7 (); > - exit (0); > -} > -#endif > Index: gcc/testsuite/g++.dg/pph/c1field.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1field.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1field.h (working copy) > @@ -1,7 +0,0 @@ > -#ifndef C1FIELD_H > -#define C1FIELD_H > -typedef int language; > -struct program { > - language field; > -}; > -#endif > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn1b.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn1b.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn1b.hi (working copy) > @@ -1,23 +0,0 @@ > -template< typename T > > -dynarray<T>::dynarray(size_type c) > -: store( alloc( c ) ), count( c ) > -{ > - size_type i; > - try { > - for ( size_type i = 0; i < count; ++i ) > - new (store+i) T; > - } > - catch ( ... ) { > - for ( ; i > 0; --i ) > - (store+(i-1))->~T(); > - throw; > - } > -} > - > -template< typename T > > -dynarray<T>::~dynarray() > -{ > - for ( size_type i = 0; i < count; ++i ) > - (store+i)->~T(); > - delete[] store; > -} > Index: gcc/testsuite/g++.dg/pph/c1altinc1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1altinc1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1altinc1.h (working copy) > @@ -1,4 +0,0 @@ > -#ifndef C1ALTINC1_H > -#define C1ALTINC1_H > -extern float f1; > -#endif > Index: gcc/testsuite/g++.dg/pph/x0template.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0template.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0template.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1TEMPLATE_H > -#define X1TEMPLATE_H > +#ifndef X0TEMPLATE_H > +#define X0TEMPLATE_H > extern int x; > struct B; > template< typename T > > Index: gcc/testsuite/g++.dg/pph/c1typerefs.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1typerefs.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1typerefs.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "c1typerefs.h" > +#include "c0typerefs.h" > int base_from_var() { > base variable; > } > Index: gcc/testsuite/g++.dg/pph/x1dynarray4.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray4.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray4.cc (working copy) > @@ -1,19 +0,0 @@ > -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } > -// { dg-bogus "cstdlib:42:0: error: PPH file stdlib.pph fails macro validation, __STDDEF_H__" "" { xfail *-*-* } 0 } > - > -#include "x1dynarray5.h" > - > -#include <algorithm> > - > -#include "a1integer.h" > -typedef tst::dynarray< integer > integer_array; > - > -int main() > -{ > - #include "a1dynarray-use1.cci" > - std::sort( sorted.begin(), sorted.end() ); > - #include "a1dynarray-use2.cci" > - #include "a1dynarray-use3a.cci" > - #include "a1dynarray-use4a.cci" > - return sum - 23; > -} > Index: gcc/testsuite/g++.dg/pph/c1altinc.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1altinc.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1altinc.cc (working copy) > @@ -1,5 +0,0 @@ > -#include "c1altinc2.h" > -void foo (void) > -{ > - int x = var1 + var2 - (int) f1; > -} > Index: gcc/testsuite/g++.dg/pph/x6dynarray6.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x6dynarray6.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x6dynarray6.h (working copy) > @@ -3,10 +3,10 @@ > // { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } > // { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } > > -#ifndef X1DYNARRAY6_H > -#define X1DYNARRAY6_H > +#ifndef X6DYNARRAY6_H > +#define X6DYNARRAY6_H > > -#include "x1dynarray4.h" > +#include "x0dynarray4.h" > > #include <new> > #include <memory> > @@ -14,9 +14,9 @@ > > namespace tst { > > -#include "a1dynarray-dfn1b.hi" > -#include "a1dynarray-dfn2c.hi" > -#include "a1dynarray-dfn3c.hi" > +#include "a0dynarray-dfn1b.hi" > +#include "a0dynarray-dfn2c.hi" > +#include "a0dynarray-dfn3c.hi" > > } // namespace tst > > Index: gcc/testsuite/g++.dg/pph/c1funcmac.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1funcmac.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1funcmac.h (working copy) > @@ -1,7 +0,0 @@ > -#ifndef C1FUNCMAC_H > -#define C1FUNCMAC_H > -#define gnu_dev_major(dev) long dev > -#define gnu_dev_minor(dev) short dev > -#define major(dev) gnu_dev_major (dev) > -#define minor(dev) gnu_dev_minor (dev) > -#endif > Index: gcc/testsuite/g++.dg/pph/x1globalref.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1globalref.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1globalref.cc (working copy) > @@ -1,6 +1,6 @@ > // pph asm xdiff > > -#include "x1globalref.h" > +#include "x0globalref.h" > > type x = 2; > type y = x; > Index: gcc/testsuite/g++.dg/pph/c1struct.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1struct.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1struct.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "c1struct.h" > +#include "c0struct.h" > > thing var1; > thing var2 = { 3 }; > Index: gcc/testsuite/g++.dg/pph/x0tmplclass.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0tmplclass.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0tmplclass.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1TMPLCLASS_H > -#define X1TMPLCLASS_H > +#ifndef X0TMPLCLASS_H > +#define X0TMPLCLASS_H > template< typename T > > struct wrapper { > T value; > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn2a.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn2a.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn2a.hi (working copy) > @@ -1,4 +0,0 @@ > -template< typename T > > -dynarray<T>::dynarray(const dynarray& d) > -: store( alloc( d.count ) ), count( d.count ) > -{ memcpy( store, d.store, count * sizeof(T) ); } > Index: gcc/testsuite/g++.dg/pph/x1struct0.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1struct0.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1struct0.h (working copy) > @@ -1,7 +0,0 @@ > -#ifndef X1STRUCT0_H > -#define X1STRUCT0_H > -typedef int type; > -struct B { > -}; > -typedef B thing; > -#endif > Index: gcc/testsuite/g++.dg/pph/c0dupguard2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0dupguard2.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0dupguard2.h (working copy) > @@ -1,4 +1,4 @@ > -#ifndef C2DUPGUARD_H > -#define C2DUPGUARD_H > +#ifndef C0DUPGUARD_H > +#define C0DUPGUARD_H > extern int x; > #endif > Index: gcc/testsuite/g++.dg/pph/x0ten-hellos.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0ten-hellos.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0ten-hellos.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef A_H_ > -#define A_H_ > +#ifndef X0TEN_HELLOS_H > +#define X0TEN_HELLOS_H > extern "C" { > int printf(const char*, ...); > void abort(void); > Index: gcc/testsuite/g++.dg/pph/x1dynarray2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray2.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray2.h (working copy) > @@ -1,23 +0,0 @@ > -#ifndef X1DYNARRAY2_H > -#define X1DYNARRAY2_H > - > -extern "C" void *memcpy(void *dest, const void *src, unsigned long n); > -extern "C" void exit(int) throw(); > - > -namespace tst { > - > -template< typename T > > -struct dynarray > -{ > - #include "a1dynarray-dcl1.hi" > - #include "a1dynarray-dcl2a.hi" > - #include "a1dynarray-dcl3.hi" > -}; > - > -#include "a1dynarray-dfn1a.hi" > -#include "a1dynarray-dfn2a.hi" > -#include "a1dynarray-dfn3a.hi" > - > -} // namespace tst > - > -#endif > Index: gcc/testsuite/g++.dg/pph/c1funcstatic.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1funcstatic.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1funcstatic.h (working copy) > @@ -1,7 +0,0 @@ > -#ifndef C1FUNCSTATIC_H > -#define C1FUNCSTATIC_H > -static int f() { > - static int x = 3; > - return x++; > -} > -#endif > Index: gcc/testsuite/g++.dg/pph/c0functions.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0functions.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0functions.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef C1FUNCTIONS_H > -#define C1FUNCTIONS_H > +#ifndef C0FUNCTIONS_H > +#define C0FUNCTIONS_H > extern int extern_only(int); // > extern int extern_then_body(int); // > #endif > Index: gcc/testsuite/g++.dg/pph/x7dynarray7.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x7dynarray7.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x7dynarray7.cc (working copy) > @@ -6,23 +6,23 @@ > #include <algorithm> > #include <iostream> > > -#include "x1dynarray7.h" > +#include "x5dynarray7.h" > > -#include "a1integer.h" > +#include "a0integer.h" > typedef tst::dynarray< integer > integer_array; > > -#include "a1dynarray-hlp1.cci" > +#include "a0dynarray-hlp1.cci" > > int main() > { > - #include "a1dynarray-use1.cci" > + #include "a0dynarray-use1.cci" > dump( source ); > dump( sorted ); > std::sort( sorted.begin(), sorted.end() ); > dump( sorted ); > - #include "a1dynarray-use2.cci" > + #include "a0dynarray-use2.cci" > dump( target ); > - #include "a1dynarray-use3b.cci" > - #include "a1dynarray-use4b.cci" > + #include "a0dynarray-use3b.cci" > + #include "a0dynarray-use4b.cci" > return sum - 23; > } > Index: gcc/testsuite/g++.dg/pph/a1dynarray-use1.cci > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-use1.cci (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-use1.cci (working copy) > @@ -1,4 +0,0 @@ > - integer_array source(3); > - for ( integer_array::size_type ix = 0; ix < source.size(); ++ix ) > - source[ix] = integer(4 - ix); > - integer_array sorted( source ); > Index: gcc/testsuite/g++.dg/pph/d2dupguard.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/d2dupguard.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/d2dupguard.cc (working copy) > @@ -1,3 +0,0 @@ > -#include "c2dupguard1.h" > -#include "c2dupguard2.h" // { dg-error "fails macro validation" "" { xfail *-*-* } } > -int foo() { return x; } > Index: gcc/testsuite/g++.dg/pph/c3multinc.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c3multinc.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c3multinc.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "c1multinc2.h" > +#include "c3multinc2.h" > void foo (void) > { > int x = var1 + var2 - (int) f1; > Index: gcc/testsuite/g++.dg/pph/x1namespace.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1namespace.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1namespace.h (working copy) > @@ -1,22 +0,0 @@ > -#ifndef X1NAMESPACE_H > -#define X1NAMESPACE_H > -namespace A { > -extern int x; > -struct B; > -template< typename T > > -struct C { > - T* b; > - int method(); > - int another() > - { return *b; } > -}; > -template< typename T > > -int C< T >::method() > -{ return x; } > -} // namespace A > -struct D : A::C< int > { > - int method(); > - int another() > - { return *b; } > -}; > -#endif > Index: gcc/testsuite/g++.dg/pph/d1symnotinc.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/d1symnotinc.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/d1symnotinc.cc (working copy) > @@ -1,4 +1,4 @@ > // { dg-error "Cannot open PPH file for reading" } > #define NAME v > #define VALUE 1 > -#include "d1symnotinc.h" > +#include "d0symnotinc.h" > Index: gcc/testsuite/g++.dg/pph/c3builtin2.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c3builtin2.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c3builtin2.cc (working copy) > @@ -1,3 +1,3 @@ > -#include "a2builtin4.h" > -#include "c2builtin5.h" > -#include "c2builtin6.h" > +#include "a0builtin4.h" > +#include "c0builtin5.h" > +#include "c0builtin6.h" > Index: gcc/testsuite/g++.dg/pph/c4pr36533.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c4pr36533.h (revision 0) > +++ gcc/testsuite/g++.dg/pph/c4pr36533.h (revision 0) > @@ -0,0 +1,16 @@ > +/* PR target/36533 */ > +/* { dg-options "-w -fpermissive" } */ > + > +#ifndef C4PR36533_H > +#define C4PR36533_H > + > +#include <sys/mman.h> > +#include <string.h> > + > +#ifndef MAP_ANONYMOUS > +#define MAP_ANONYMOUS MAP_ANON > +#endif > + > +#include "a0pr36533.h" > + > +#endif > Index: gcc/testsuite/g++.dg/pph/c1altinc2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1altinc2.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1altinc2.h (working copy) > @@ -1,12 +0,0 @@ > -#ifndef C1ALTINC2 > -#define C1ALTINC2 > -extern void foo (void); > -#define X 1 > -#if defined X > -#include "c1altinc1.h" > -extern int var1; > -extern int var2; > -#else > -#include "c1altinc1.h" > -#endif > -#endif > Index: gcc/testsuite/g++.dg/pph/x0hardlookup.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0hardlookup.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0hardlookup.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1HARDLOOKUP_H > -#define X1HARDLOOKUP_H > +#ifndef X0HARDLOOKUP_H > +#define X0HARDLOOKUP_H > struct V { int a; static int b;}; > namespace N { > int V; > Index: gcc/testsuite/g++.dg/pph/x1variables.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1variables.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1variables.h (working copy) > @@ -1,6 +1,6 @@ > #ifndef X1VARIABLES_H > #define X1VARIABLES_H > -#include "c1variables.h" > +#include "c0variables.h" > struct D { > static int mbr_init_plain; > static int mbr_uninit_plain; > Index: gcc/testsuite/g++.dg/pph/x1special.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1special.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1special.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "x1special.h" > +#include "x0special.h" > > B b(1); > > Index: gcc/testsuite/g++.dg/pph/c1simple1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1simple1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1simple1.h (working copy) > @@ -1,7 +0,0 @@ > -#ifndef C1SIMPLE1_H > -#define C1SIMPLE1_H > - > -#define assert(x) yellow(x) > -extern void yellow(int); > - > -#endif > Index: gcc/testsuite/g++.dg/pph/c3altinc.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c3altinc.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c3altinc.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "c1altinc2.h" > +#include "c3altinc2.h" > void foo (void) > { > int x = var1 + var2 - (int) f1; > Index: gcc/testsuite/g++.dg/pph/c1chained1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1chained1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1chained1.h (working copy) > @@ -1,4 +0,0 @@ > -#ifndef C1CHAINED1_H > -#define C1CHAINED1_H > -#define ONE 1 > -#endif > Index: gcc/testsuite/g++.dg/pph/a1dynarray-use4b.cci > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-use4b.cci (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-use4b.cci (working copy) > @@ -1,5 +0,0 @@ > - int sum = 0; > - for ( integer_array::reverse_iterator it = target.rbegin(); > - it != target.rend(); > - ++it ) > - sum += *it; > Index: gcc/testsuite/g++.dg/pph/x1overload3.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1overload3.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x1overload3.h (working copy) > @@ -1,6 +1,6 @@ > -#ifndef X2OVERLOAD3_H > -#define X2OVERLOAD3_H > -#include "x2overload1.h" > +#ifndef X1OVERLOAD3_H > +#define X1OVERLOAD3_H > +#include "x0overload1.h" > inline int f() > { > float x = 2.3f; > Index: gcc/testsuite/g++.dg/pph/c4pr36533.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c4pr36533.cc (revision 0) > +++ gcc/testsuite/g++.dg/pph/c4pr36533.cc (revision 0) > @@ -0,0 +1,3 @@ > +/* { dg-options "-w -fpermissive" } */ > +// pph asm xdiff > +#include "c4pr36533.h" > Index: gcc/testsuite/g++.dg/pph/c1simple.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1simple.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1simple.cc (working copy) > @@ -1,8 +0,0 @@ > -/* comment */ > - > -#include "c1simple2.h" > - > -int main() > -{ > - return foo(); > -} > Index: gcc/testsuite/g++.dg/pph/c2builtin1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2builtin1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2builtin1.h (working copy) > @@ -1,5 +0,0 @@ > -#ifndef C2BUILTIN1_H > -#define C2BUILTIN1_H > -#define QUOTE(arg) #arg > -#define VALUE(arg) QUOTE(arg) > -#endif > Index: gcc/testsuite/g++.dg/pph/c1chained.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1chained.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1chained.cc (working copy) > @@ -1,3 +1,3 @@ > -#include "c1chained1.h" > -#include "c1chained2.h" > +#include "c0chained1.h" > +#include "c0chained2.h" > int x = TWO; > Index: gcc/testsuite/g++.dg/pph/a2builtin4.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/a2builtin4.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a2builtin4.h (working copy) > @@ -1,2 +0,0 @@ > -#define QUOTE(arg) #arg > -#define VALUE(arg) QUOTE(arg) > Index: gcc/testsuite/g++.dg/pph/pph.map > =================================================================== > --- gcc/testsuite/g++.dg/pph/pph.map (revision 176187) > +++ gcc/testsuite/g++.dg/pph/pph.map (working copy) > @@ -1,67 +1,67 @@ > -c120060625-1.h c120060625-1.pph > -c1altinc1.h c1altinc1.pph > -c1altinc2.h c1altinc2.pph > -c1attr-warn-unused-result.h c1attr-warn-unused-result.pph > -c1builtin-integral-1.h c1builtin-integral-1.pph > -c1builtin-object-size-2.h c1builtin-object-size-2.pph > -c1chained1.h c1chained1.pph > -c1chained2.h c1chained2.pph > +c0-20060625-1.h c0-20060625-1.pph > +c0altinc1.h c0altinc1.pph > +c3altinc2.h c3altinc2.pph > +c0attr-warn-unused.h c0attr-warn-unused.pph > +c0builtin-integral.h c0builtin-integral.pph > +c0builtin-objsize.h c0builtin-objsize.pph > +c0chained1.h c0chained1.pph > +c0chained2.h c0chained2.pph > c1eabi1.h c1eabi1.pph > -c1empty.h c1empty.pph > -c1field.h c1field.pph > -c1funcmac.h c1funcmac.pph > -c1funcstatic.h c1funcstatic.pph > -c1functions.h c1functions.pph > -c1guarded1.h c1guarded1.pph > +c0empty.h c0empty.pph > +c0field.h c0field.pph > +c0funcmac.h c0funcmac.pph > +c0funcstatic.h c0funcstatic.pph > +c0functions.h c0functions.pph > +c0guarded1.h c0guarded1.pph > c1guarded2.h c1guarded2.pph > c1guarded3.h c1guarded3.pph > -c1limits-externalid.h c1limits-externalid.pph > -c1meteor-contest.h c1meteor-contest.pph > -c1multinc1.h c1multinc1.pph > +c0limits-externalid.h c0limits-externalid.pph > +c0meteor-contest.h c0meteor-contest.pph > +c0multinc1.h c0multinc1.pph > c1multinc2.h c1multinc2.pph > c1pr36533.h c1pr36533.pph > -c1pr44948-1a.h c1pr44948-1a.pph > -c1return-5.h c1return-5.pph > -c1simple1.h c1simple1.pph > +c0pr44948-1a.h c0pr44948-1a.pph > +c0return-5.h c0return-5.pph > +c0simple1.h c0simple1.pph > c1simple2.h c1simple2.pph > -c1struct.h c1struct.pph > -c1typerefs.h c1typerefs.pph > -c1variables.h c1variables.pph > -c1varorder.h c1varorder.pph > -c2builtin1.h c2builtin1.pph > -c2builtin2.h c2builtin2.pph > -c2builtin3.h c2builtin3.pph > -c2builtin5.h c2builtin5.pph > -c2builtin6.h c2builtin6.pph > -c2dupguard1.h c2dupguard1.pph > -c2dupguard2.h c2dupguard2.pph > -c2eabi1.h c2eabi1.pph > -c2meteor-contest.h c2meteor-contest.pph > -c2paste.h c2paste.pph > -d1symnotinc.h d1symnotinc.pph > +c0struct.h c0struct.pph > +c0typerefs.h c0typerefs.pph > +c0variables.h c0variables.pph > +c0varorder.h c0varorder.pph > +c0builtin1.h c0builtin1.pph > +c1builtin2.h c1builtin2.pph > +c1builtin3.h c1builtin3.pph > +c0builtin5.h c0builtin5.pph > +c0builtin6.h c0builtin6.pph > +c0dupguard1.h c0dupguard1.pph > +c0dupguard2.h c0dupguard2.pph > +c4eabi1.h c4eabi1.pph > +c4meteor-contest.h c4meteor-contest.pph > +c0paste.h c0paste.pph > +d0symnotinc.h d0symnotinc.pph > math.h math.pph > stdio.h stdio.pph > stdlib.h stdlib.pph > string.h string.pph > sys/types.h types.pph > -x1autometh.h x1autometh.pph > -x1dynarray1.h x1dynarray1.pph > +x0autometh.h x0autometh.pph > +x0dynarray1.h x0dynarray1.pph > x1funcstatic.h x1funcstatic.pph > x1functions.h x1functions.pph > -x1globalref.h x1globalref.pph > -x1hardlookup.h x1hardlookup.pph > -x1namespace.h x1namespace.pph > -x1special.h x1special.pph > -x1struct0.h x1struct0.pph > +x0globalref.h x0globalref.pph > +x0hardlookup.h x0hardlookup.pph > +x0namespace.h x0namespace.pph > +x0special.h x0special.pph > +x0struct0.h x0struct0.pph > x1struct1.h x1struct1.pph > x1struct2.h x1struct2.pph > -x1template.h x1template.pph > -x1ten-hellos.h x1ten-hellos.pph > -x1tmplclass.h x1tmplclass.pph > -x1tmplfunc.h x1tmplfunc.pph > +x0template.h x0template.pph > +x0ten-hellos.h x0ten-hellos.pph > +x0tmplclass.h x0tmplclass.pph > +x0tmplfunc.h x0tmplfunc.pph > x1typerefs.h x1typerefs.pph > x1variables.h x1variables.pph > -x2nontrivinit.h x2nontrivinit.pph > -x2overload1.h x2overload1.pph > -x2overload2.h x2overload2.pph > -x2overload3.h x2overload3.pph > +x0nontrivinit.h x0nontrivinit.pph > +x0overload1.h x0overload1.pph > +x0overload2.h x0overload2.pph > +x1overload3.h x1overload3.pph > Index: gcc/testsuite/g++.dg/pph/x1struct1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1struct1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1struct1.h (working copy) > @@ -1,6 +1,6 @@ > #ifndef X1STRUCT1_H > #define X1STRUCT1_H > -#include "x1struct0.h" > +#include "x0struct0.h" > struct D : public thing { > type method(); > type another() > Index: gcc/testsuite/g++.dg/pph/c0multinc1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0multinc1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0multinc1.h (working copy) > @@ -1,4 +1,4 @@ > -#ifndef C1MULTINC1_H > -#define C1MULTINC1_H > +#ifndef C0MULTINC1_H > +#define C0MULTINC1_H > extern float f1; > #endif > Index: gcc/testsuite/g++.dg/pph/c1guarded1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1guarded1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1guarded1.h (working copy) > @@ -1,4 +0,0 @@ > -#ifndef C1GUARDED1_H > -#define C1GUARDED1_H > -typedef int type; > -#endif > Index: gcc/testsuite/g++.dg/pph/c0limits-externalid.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0limits-externalid.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0limits-externalid.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > +#ifndef C0LIMITS_EXTERNALID_H > +#define C0LIMITS_EXTERNALID_H > #define LIM1(x) x##0; x##1; x##2; x##3; x##4; x##5; x##6; x##7; x##8; x##9; > #define LIM2(x) LIM1(x##0) LIM1(x##1) LIM1(x##2) LIM1(x##3) LIM1(x##4) \ > LIM1(x##5) LIM1(x##6) LIM1(x##7) LIM1(x##8) LIM1(x##9) > Index: gcc/testsuite/g++.dg/pph/x1template.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1template.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1template.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "x1template.h" > +#include "x0template.h" > > int x = 3; > > Index: gcc/testsuite/g++.dg/pph/c3multinc2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c3multinc2.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c3multinc2.h (working copy) > @@ -1,8 +1,8 @@ > -#ifndef C1MULTINC2 > -#define C1MULTINC2 > -#include "c1altinc1.h" > +#ifndef C3MULTINC2 > +#define C3MULTINC2 > +#include "c0multinc1.h" > extern void foo (void); > extern int var1; > extern int var2; > -#include "c1altinc1.h" > +#include "c0multinc1.h" > #endif > Index: gcc/testsuite/g++.dg/pph/a1dynarray-hlp1.cci > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-hlp1.cci (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-hlp1.cci (working copy) > @@ -1,12 +0,0 @@ > -integer& operator<<(std::ostream& os, integer iv) > -{ > - os << (int)iv; > -} > - > -void dump( const integer_array& source ) > -{ > - integer_array::const_iterator it = source.cbegin(); > - for ( ; it != source.end(); ++it ) > - std::cout << " " << *it; > - std::cout << std::endl; > -} > Index: gcc/testsuite/g++.dg/pph/x1dynarray3.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray3.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray3.h (working copy) > @@ -1,23 +0,0 @@ > -#ifndef X1DYNARRAY3_H > -#define X1DYNARRAY3_H > - > -#include <stddef.h> > -#include <new> > - > -namespace tst { > - > -template< typename T > > -struct dynarray > -{ > - #include "a1dynarray-dcl1.hi" > - #include "a1dynarray-dcl2b.hi" > - #include "a1dynarray-dcl3.hi" > -}; > - > -#include "a1dynarray-dfn1b.hi" > -#include "a1dynarray-dfn2b.hi" > -#include "a1dynarray-dfn3b.hi" > - > -} // namespace tst > - > -#endif > Index: gcc/testsuite/g++.dg/pph/x1dynarray5.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray5.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray5.cc (working copy) > @@ -1,29 +0,0 @@ > -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } > -// { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } > -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } > -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } > - > -#include "x1dynarray4.h" > -#include "x1dynarray5.h" > - > -#include <algorithm> > -#include <iostream> > - > -#include "a1integer.h" > -typedef tst::dynarray< integer > integer_array; > - > -#include "a1dynarray-hlp1.cci" > - > -int main() > -{ > - #include "a1dynarray-use1.cci" > - dump( source ); > - dump( sorted ); > - std::sort( sorted.begin(), sorted.end() ); > - dump( sorted ); > - #include "a1dynarray-use2.cci" > - dump( target ); > - #include "a1dynarray-use3a.cci" > - #include "a1dynarray-use4a.cci" > - return sum - 23; > -} > Index: gcc/testsuite/g++.dg/pph/c120060625-1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c120060625-1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c120060625-1.h (working copy) > @@ -1,15 +0,0 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > - > -/* PR middle-end/28151 */ > -/* Testcase by Steven Bosscher <stevenb.gcc@gmail.com> */ > - > -_Complex float b; > - > -void foo (void) > -{ > - _Complex float a = __FLT_MAX__; > - b = __FLT_MAX__ + a; > -} > -#endif > - > Index: gcc/testsuite/g++.dg/pph/y9overload.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/y9overload.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/y9overload.cc (working copy) > @@ -1,6 +1,6 @@ > -#include "x2overload1.h" > -#include "x2overload2.h" > -#include "x2overload3.h" > +#include "x0overload1.h" > +#include "x0overload2.h" > +#include "x1overload3.h" > // { dg-error "inconsistent overload resolution" "" { xfail *-*-* } } > > int g() > Index: gcc/testsuite/g++.dg/pph/c1guarded.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1guarded.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1guarded.cc (working copy) > @@ -1,2 +0,0 @@ > -#include "c1guarded2.h" > -#include "c1guarded3.h" > Index: gcc/testsuite/g++.dg/pph/c2paste.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2paste.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2paste.cc (working copy) > @@ -1,6 +0,0 @@ > -#include "c2paste.h" > -void foo_30_(int); > -void bar(void) > -{ > - M(30); > -} > Index: gcc/testsuite/g++.dg/pph/x1tmplfunc.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1tmplfunc.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1tmplfunc.h (working copy) > @@ -1,9 +0,0 @@ > -#ifndef X1TMPLFUNC_H > -#define X1TMPLFUNC_H > -typedef int type; > -extern type val; > - > -template< typename T > > -T identity(T arg) > -{ return arg + val; } > -#endif > Index: gcc/testsuite/g++.dg/pph/c1return-5.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1return-5.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1return-5.cc (working copy) > @@ -1,4 +1,4 @@ > // { dg-options "-mpreferred-stack-boundary=4" } > // { dg-final { scan-assembler-not "and\[lq\]?\[^\\n\]*-64,\[^\\n\]*sp" } } > > -#include "c1return-5.h" > +#include "c0return-5.h" > Index: gcc/testsuite/g++.dg/pph/x0overload1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0overload1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0overload1.h (working copy) > @@ -1,4 +1,4 @@ > -#ifndef X2OVERLOAD1_H > -#define X2OVERLOAD1_H > +#ifndef X0OVERLOAD1_H > +#define X0OVERLOAD1_H > int o(double x); > #endif > Index: gcc/testsuite/g++.dg/pph/d8dupguard.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/d8dupguard.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/d8dupguard.cc (working copy) > @@ -1,3 +1,3 @@ > -#include "c2dupguard1.h" > -#include "c2dupguard2.h" // { dg-error "fails macro validation" "" { xfail *-*-* } } > +#include "c0dupguard1.h" > +#include "c0dupguard2.h" // { dg-error "fails macro validation" "" { xfail *-*-* } } > int foo() { return x; } > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dcl3.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dcl3.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dcl3.hi (working copy) > @@ -1,49 +0,0 @@ > -private: > - > - // fields: > - T* store; > - size_type count; > - > - // helper functions: > - void check(size_type n); > - > - T* alloc(size_type n) > - { return reinterpret_cast<T*>( new char[ n*sizeof(T) ] ); } > - > -public: > - // construct and destruct: > - dynarray(); // undefined > - const dynarray operator=(const dynarray&); // undefined > - > - explicit dynarray(size_type c); > - dynarray(const dynarray& d); > - ~dynarray(); > - > - // capacity: > - size_type size() const { return count; } > - size_type max_size() const { return count; } > - bool empty() const { return false; } > - > - // element access: > - reference operator[](size_type n) { return store[n]; } > - const_reference operator[](size_type n) const { return store[n]; } > - > - reference front() { return store[0]; } > - const_reference front() const { return store[0]; } > - reference back() { return store[count-1]; } > - const_reference back() const { return store[count-1]; } > - > - const_reference at(size_type n) const { check(n); return store[n]; } > - reference at(size_type n) { check(n); return store[n]; } > - > - // data access: > - T* data() { return store; } > - const T* data() const { return store; } > - > - // iterators: > - iterator begin() { return store; } > - const_iterator begin() const { return store; } > - const_iterator cbegin() const { return store; } > - iterator end() { return store + count; } > - const_iterator end() const { return store + count; } > - const_iterator cend() const { return store + count; } > Index: gcc/testsuite/g++.dg/pph/c1struct.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1struct.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1struct.h (working copy) > @@ -1,9 +0,0 @@ > -#ifndef C1STRUCT_H > -#define C1STRUCT_H > -typedef int type; > -type gbl = 1; > -struct B { > - type fld; > -}; > -typedef B thing; > -#endif > Index: gcc/testsuite/g++.dg/pph/x1funcstatic.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1funcstatic.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1funcstatic.cc (working copy) > @@ -1,2 +1,2 @@ > -#include "c1funcstatic.h" > +#include "c0funcstatic.h" > int a = f(); > Index: gcc/testsuite/g++.dg/pph/c2builtin1.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2builtin1.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2builtin1.cc (working copy) > @@ -1,3 +0,0 @@ > -#include "c2builtin1.h" > -#include "c2builtin2.h" > -#include "c2builtin3.h" > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn2b.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn2b.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn2b.hi (working copy) > @@ -1,15 +0,0 @@ > -template< typename T > > -dynarray<T>::dynarray(const dynarray& d) > -: store( alloc( d.count ) ), count( d.count ) > -{ > - size_type i; > - try { > - for ( size_type i = 0; i < count; ++i ) > - new (store+i) T(d.store[i]); > - } > - catch ( ... ) { > - for ( ; i > 0; --i ) > - (store+(i-1))->~T(); > - delete store; throw; > - } > -} > Index: gcc/testsuite/g++.dg/pph/a1integer.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1integer.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1integer.h (working copy) > @@ -1,22 +0,0 @@ > -#ifndef A1INTEGER_H > -#define A1INTEGER_H > - > -class integer > -{ > - int value; > -public: > - integer() > - : value(0) { } > - integer( int v ) > - : value(v) { } > - integer( const integer& other ) > - : value( other.value ) { } > - integer& operator=( const integer& other ) > - { value = other.value; return *this; } > - operator int() const > - { return value; } > - bool operator <( const integer& other ) const > - { return value < other.value; } > -}; > - > -#endif > Index: gcc/testsuite/g++.dg/pph/x1hardlookup.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1hardlookup.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1hardlookup.cc (working copy) > @@ -1,6 +1,6 @@ > // pph asm xdiff > > -#include "x1hardlookup.h" > +#include "x0hardlookup.h" > > D P; > > Index: gcc/testsuite/g++.dg/pph/c1empty.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1empty.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1empty.cc (working copy) > @@ -1 +1 @@ > -#include "c1empty.h" > +#include "c0empty.h" > Index: gcc/testsuite/g++.dg/pph/c3altinc2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c3altinc2.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c3altinc2.h (working copy) > @@ -1,12 +1,12 @@ > -#ifndef C1ALTINC2 > -#define C1ALTINC2 > +#ifndef C3ALTINC2 > +#define C3ALTINC2 > extern void foo (void); > #define X 1 > #if defined X > -#include "c1altinc1.h" > +#include "c0altinc1.h" > extern int var1; > extern int var2; > #else > -#include "c1altinc1.h" > +#include "c0altinc1.h" > #endif > #endif > Index: gcc/testsuite/g++.dg/pph/x0dynarray1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0dynarray1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0dynarray1.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1DYNARRAY1_H > -#define X1DYNARRAY1_H > +#ifndef X0DYNARRAY1_H > +#define X0DYNARRAY1_H > > extern "C" void *memcpy(void *dest, const void *src, unsigned long n); > extern "C" void exit(int) throw(); > @@ -7,13 +7,13 @@ extern "C" void exit(int) throw(); > template< typename T > > struct dynarray > { > - #include "a1dynarray-dcl1.hi" > - #include "a1dynarray-dcl2a.hi" > - #include "a1dynarray-dcl3.hi" > + #include "a0dynarray-dcl1.hi" > + #include "a0dynarray-dcl2a.hi" > + #include "a0dynarray-dcl3.hi" > }; > > -#include "a1dynarray-dfn1a.hi" > -#include "a1dynarray-dfn2a.hi" > -#include "a1dynarray-dfn3a.hi" > +#include "a0dynarray-dfn1a.hi" > +#include "a0dynarray-dfn2a.hi" > +#include "a0dynarray-dfn3a.hi" > > #endif > Index: gcc/testsuite/g++.dg/pph/c1builtin-integral-1.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1builtin-integral-1.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1builtin-integral-1.cc (working copy) > @@ -1,2 +0,0 @@ > -// pph asm xdiff > -#include "c1builtin-integral-1.h" > Index: gcc/testsuite/g++.dg/pph/x1special.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1special.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1special.h (working copy) > @@ -1,21 +0,0 @@ > -#ifndef X1SPECIAL_H > -#define X1SPECIAL_H > - > -struct B { > - B( int ); > - B( double ); > - B( const B& ); > - B& operator=( const B& ); > - B& operator=( int ); > - operator double(); > - ~B(); > -}; > - > -struct D { > - D( const B& ); > -}; > - > -int F( D ); > -int G( double ); > - > -#endif > Index: gcc/testsuite/g++.dg/pph/c1builtin-integral-1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1builtin-integral-1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1builtin-integral-1.h (working copy) > @@ -1,71 +0,0 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > -/* Copyright (C) 2004 Free Software Foundation. > - > - Verify that integral FP expressions are optimized. > - > - Written by Kaveh Ghazi, 2004-03-16. */ > - > -/* We need -ffinite-math-only so that we can fold "foo != foo", where > - foo is a floating point expression. We need -fno-math-errno so > - that various math functions are marked const/pure and can be > - folded. */ > -/* { dg-options "-ffinite-math-only -fno-math-errno" } */ > - > -extern int link_failure (int); > - > -/* Test that the various FP truncation builtins detect integral > - arguments. */ > -#define CHECK_FN(MATHFN) \ > - if (__builtin_##MATHFN(i1) != i1) link_failure (__LINE__); \ > - if (__builtin_##MATHFN##f(i1) != i1) link_failure (__LINE__); \ > - if (__builtin_##MATHFN##l(i1) != i1) link_failure (__LINE__); > - > -#define CHECK_FN_RET(MATHFN, RET) \ > - if (__builtin_##MATHFN(i1) != (RET)(double)i1) link_failure (__LINE__); \ > - if (__builtin_##MATHFN##f(i1) != (RET)(float)i1) link_failure (__LINE__); \ > - if (__builtin_##MATHFN##l(i1) != (RET)(long double)i1) link_failure (__LINE__); > - > - /* Check that various other integral expressions are detected. */ > -#define CHECK_EXPR(EXPR,NAME) \ > - if (__builtin_ceill(EXPR) != (EXPR)) link_failure (__LINE__); \ > - if (__builtin_lroundl(EXPR) != (long)(long double)(EXPR)) link_failure (__LINE__); > - > -void __attribute__ ((__noinline__)) test (int i1, int i2) > -{ > - CHECK_FN(ceil); > - CHECK_FN(floor); > - CHECK_FN(nearbyint); > - CHECK_FN(rint); > - CHECK_FN(round); > - CHECK_FN(trunc); > - CHECK_FN_RET(lround, long); > - CHECK_FN_RET(llround, long long); > - CHECK_FN_RET(lrint, long); > - CHECK_FN_RET(llrint, long long); > - CHECK_FN_RET(lceil, long); > - CHECK_FN_RET(llceil, long long); > - CHECK_FN_RET(lfloor, long); > - CHECK_FN_RET(llfloor, long long); > - > - CHECK_EXPR (5.0, REAL_CST); > - CHECK_EXPR (5.0F, REAL_CSTf); > - CHECK_EXPR (5.0L, REAL_CSTl); > - CHECK_EXPR ((double)i1, FLOAT_EXPR); > - CHECK_EXPR ((float)i1, FLOAT_EXPRf); > - CHECK_EXPR ((long double)i1, FLOAT_EXPRl); > - CHECK_EXPR (__builtin_fabs(i1), ABS_EXPR); > - CHECK_EXPR (__builtin_fabsf(i1), ABS_EXPRf); > - CHECK_EXPR (__builtin_fabsl(i1), ABS_EXPRl); > - CHECK_EXPR (((void)i1,(double)i2), COMPOUND_EXPR); > - CHECK_EXPR ((double)i1+i2, PLUS_EXPR); > - CHECK_EXPR ((double)i1-i2, MINUS_EXPR); > - CHECK_EXPR ((double)i1*i2, MULT_EXPR); > -} > - > -int main (void) > -{ > - test (1, 2); > - return 0; > -} > -#endif > Index: gcc/testsuite/g++.dg/pph/c1simple2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1simple2.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1simple2.h (working copy) > @@ -1,7 +1,7 @@ > #ifndef C1SIMPLE2_H > #define C1SIMPLE2_H > > -#include "c1simple1.h" > +#include "c0simple1.h" > > inline int foo() > { > Index: gcc/testsuite/g++.dg/pph/c1chained2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1chained2.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1chained2.h (working copy) > @@ -1,4 +0,0 @@ > -#ifndef C1CHAINED2_H > -#define C1CHAINED2_H > -#define TWO ONE > -#endif > Index: gcc/testsuite/g++.dg/pph/c1attr-warn-unused.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1attr-warn-unused.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c1attr-warn-unused.cc (working copy) > @@ -1,3 +1,3 @@ > /* { dg-options "-w" } */ > // pph asm xdiff > -#include "c1attr-warn-unused-result.h" > +#include "c0attr-warn-unused.h" > Index: gcc/testsuite/g++.dg/pph/c1eabi1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1eabi1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1eabi1.h (working copy) > @@ -1,167 +0,0 @@ > -// { dg-options "-w -fpermissive" } > -// FIXME pph - Enabling PPH for this file causes memory problems in cc1plus. > -// c1eabi1.h c1eabi1.pph > - > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > - > -/* This file tests most of the non-C++ run-time helper functions > - described in Section 4 of the "Run-Time ABI for the ARM > - Architecture". These are basic tests; they do not try to validate > - all of the corner cases in these routines. > - > - The functions not tested here are: > - > - __aeabi_cdcmpeq > - __aeabi_cdcmple > - __aeabi_cdrcmple > - __aeabi_cfcmpeq > - __aeabi_cfcmple > - __aeabi_cfrcmple > - __aeabi_ldivmod > - __aeabi_uldivmod > - __aeabi_idivmod > - __aeabi_uidivmod > - > - These functions have non-standard calling conventions that would > - require the use of inline assembly to test. It would be good to > - add such tests, but they have not yet been implemented. > - > - There are also no tests for the "division by zero", "memory copying, > - clearing, and setting" functions. */ > - > -/* Simplified version of c2eabi1.cc - Do not include other system > - headers here. Simply forward declare the library functions used > - by this header. */ > -extern "C" { > - extern void abort(void); > - extern int abs(int); > - extern void exit(int); > - extern double fabs(double); > - extern int printf(const char *, ...); > -} > - > -/* All these functions are defined to use the base ABI, so use the > - attribute to ensure the tests use the base ABI to call them even > - when the VFP ABI is otherwise in effect. */ > -#define PCS __attribute__((pcs("aapcs"))) > - > -#define decl_float(code, type) \ > - extern type __aeabi_ ## code ## add (type, type) PCS; \ > - extern type __aeabi_ ## code ## div (type, type) PCS; \ > - extern type __aeabi_ ## code ## mul (type, type) PCS; \ > - extern type __aeabi_ ## code ## neg (type) PCS; \ > - extern type __aeabi_ ## code ## rsub (type, type) PCS; \ > - extern type __aeabi_ ## code ## sub (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmpeq (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmplt (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmple (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmpge (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmpgt (type, type) PCS; \ > - extern int __aeabi_ ## code ## cmpun (type, type) PCS; \ > - extern int __aeabi_ ## code ## 2iz (type) PCS; \ > - extern unsigned int __aeabi_ ## code ## 2uiz (type) PCS; \ > - extern long long __aeabi_ ## code ## 2lz (type) PCS; \ > - extern unsigned long long __aeabi_ ## code ## 2ulz (type) PCS; \ > - extern type __aeabi_i2 ## code (int) PCS; \ > - extern type __aeabi_ui2 ## code (int) PCS; \ > - extern type __aeabi_l2 ## code (long long) PCS; \ > - extern type __aeabi_ul2 ## code (unsigned long long) PCS; \ > - \ > - type code ## zero = 0.0; \ > - type code ## one = 1.0; \ > - type code ## two = 2.0; \ > - type code ## four = 4.0; \ > - type code ## minus_one = -1.0; \ > - type code ## minus_two = -2.0; \ > - type code ## minus_four = -4.0; \ > - type code ## epsilon = 1E-32; \ > - type code ## NaN = 0.0 / 0.0; > - > -decl_float (d, double) > -decl_float (f, float) > - > -extern float __aeabi_d2f (double) PCS; > -extern double __aeabi_f2d (float) PCS; > -extern long long __aeabi_lmul (long long, long long); > -extern long long __aeabi_llsl (long long, int); > -extern long long __aeabi_llsr (long long, int); > -extern long long __aeabi_lasr (long long, int); > -extern int __aeabi_lcmp (long long, long long); > -extern int __aeabi_ulcmp (unsigned long long, unsigned long long); > -extern int __aeabi_idiv (int, int); > -extern unsigned int __aeabi_uidiv (unsigned int, unsigned int); > -extern int __aeabi_uread4 (void *); > -extern int __aeabi_uwrite4 (int, void *); > -extern long long __aeabi_uread8 (void *); > -extern long long __aeabi_uwrite8 (long long, void *); > - > -#define eq(a, b, type, abs, epsilon, format) \ > - { \ > - type a1; \ > - type b1; \ > - \ > - a1 = a; \ > - b1 = b; \ > - if (abs (a1 - b1) > epsilon) \ > - { \ > - printf ("%d: Test %s == %s\n", __LINE__, #a, #b); \ > - printf ("%d: " format " != " format "\n", \ > - __LINE__, a1, b1); \ > - abort (); \ > - } \ > - } > - > -#define ieq(a, b) eq (a, b, int, abs, 0, "%d") > -#define ueq(a, b) eq (a, b, unsigned int, abs, 0, "%u") > -#define leq(a, b) eq (a, b, long long, abs, 0, "%lld") > -#define uleq(a, b) eq (a, b, unsigned long long, abs, 0, "%llu") > -#define feq(a, b) eq (a, b, float, fabs, fepsilon, "%f") > -#define deq(a, b) eq (a, b, double, fabs, depsilon, "%g") > - > -#define NUM_CMP_VALUES 6 > - > -/* Values picked to cover a range of small, large, positive and negative. */ > -static unsigned int cmp_val[NUM_CMP_VALUES] = > -{ > - 0, > - 1, > - 0x40000000, > - 0x80000000, > - 0xc0000000, > - 0xffffffff > -}; > - > -/* All combinations for each of the above values. */ > -#define ulcmp(l, s, m) \ > - s, l, l, l, l, l, m, s, l, l, l, l, \ > - m, m, s, l, l, l, m, m, m, s, l, l, \ > - m, m, m, m, s, l, m, m, m, m, m, s > - > -#define lcmp(l, s, m) \ > - s, l, l, m, m, m, m, s, l, m, m, m, \ > - m, m, s, m, m, m, l, l, l, s, l, l, \ > - l, l, l, m, s, l, l, l, l, m, m, s > - > -/* All combinations of the above for high/low words. */ > -static int lcmp_results[] = > -{ > - lcmp(ulcmp(-1, -1, -1), ulcmp(-1, 0, 1), ulcmp(1, 1, 1)) > -}; > - > -static int ulcmp_results[] = > -{ > - ulcmp(ulcmp(-1, -1, -1), ulcmp(-1, 0, 1), ulcmp(1, 1, 1)) > -}; > - > -static int signof(int i) > -{ > - if (i < 0) > - return -1; > - > - if (i == 0) > - return 0; > - > - return 1; > -} > -#endif > Index: gcc/testsuite/g++.dg/pph/c1pr36533.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1pr36533.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1pr36533.cc (working copy) > @@ -1,3 +0,0 @@ > -/* { dg-options "-w -fpermissive" } */ > -// pph asm xdiff > -#include "c1pr36533.h" > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dcl2a.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dcl2a.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dcl2a.hi (working copy) > @@ -1,3 +0,0 @@ > - // system-based types: > - typedef unsigned long size_type; > - typedef long difference_type; > Index: gcc/testsuite/g++.dg/pph/d1symnotinc.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/d1symnotinc.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/d1symnotinc.h (working copy) > @@ -1,5 +0,0 @@ > -#ifndef D1SDYMNOTINC_H > -#define D1SDYMNOTINC_H > -struct T { int f; }; > -struct T NAME = { VALUE }; // { dg-error "was not declared in this scope" } > -#endif > Index: gcc/testsuite/g++.dg/pph/c2builtin2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2builtin2.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2builtin2.h (working copy) > @@ -1,9 +0,0 @@ > -#ifndef C2BUILTIN2_H > -#define C2BUILTIN2_H > -#include "c2builtin1.h" > -const char *file = VALUE(__FILE__); > -const char *line = VALUE(__LINE__); > -const char *vers = VALUE(__cplusplus); > -const char *optm = VALUE(__OPTIMIZE__); > -const char *func() { return __func__; } > -#endif > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn3a.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn3a.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn3a.hi (working copy) > @@ -1,3 +0,0 @@ > -template< typename T > > -void dynarray<T>::check(size_type n) > -{ if ( n >= count ) exit(1); } > Index: gcc/testsuite/g++.dg/pph/x1struct2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1struct2.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1struct2.h (working copy) > @@ -1,6 +1,6 @@ > #ifndef X1STRUCT_H > #define X1STRUCT_H > -#include "c1struct.h" > +#include "c0struct.h" > struct D : thing { > type method(); > type another() > Index: gcc/testsuite/g++.dg/pph/c2dupguard1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2dupguard1.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2dupguard1.h (working copy) > @@ -1,4 +0,0 @@ > -#ifndef C2DUPGUARD_H > -#define C2DUPGUARD_H > -extern int x; > -#endif > Index: gcc/testsuite/g++.dg/pph/x1ten-hellos.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1ten-hellos.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1ten-hellos.cc (working copy) > @@ -1,6 +1,6 @@ > // { dg-do run } > > -#include "x1ten-hellos.h" > +#include "x0ten-hellos.h" > > int main(void) > { > Index: gcc/testsuite/g++.dg/pph/c1guarded2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1guarded2.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1guarded2.h (working copy) > @@ -1,5 +1,5 @@ > #ifndef C1GUARDED2_H > #define C1GUARDED2_H > -#include "c1guarded1.h" > +#include "c0guarded1.h" > type variable2; > #endif > Index: gcc/testsuite/g++.dg/pph/x1dynarray2a.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray2a.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray2a.cc (working copy) > @@ -1,6 +1,6 @@ > // { dg-do run } > > -#include "x1dynarray2.h" > +#include "x0dynarray2.h" > > typedef int integer; > using namespace tst; > @@ -8,8 +8,8 @@ typedef dynarray< integer > integer_arra > > int main() > { > - #include "a1dynarray-use1.cci" > - #include "a1dynarray-use2.cci" > - #include "a1dynarray-use4a.cci" > + #include "a0dynarray-use1.cci" > + #include "a0dynarray-use2.cci" > + #include "a0dynarray-use4a.cci" > return sum - 25; > } > Index: gcc/testsuite/g++.dg/pph/x1dynarray4.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray4.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray4.h (working copy) > @@ -1,18 +0,0 @@ > -#ifndef X1DYNARRAY4_H > -#define X1DYNARRAY4_H > - > -#include <stddef.h> > - > -namespace tst { > - > -template< typename T > > -struct dynarray > -{ > - #include "a1dynarray-dcl1.hi" > - #include "a1dynarray-dcl2b.hi" > - #include "a1dynarray-dcl3.hi" > -}; > - > -} // namespace tst > - > -#endif > Index: gcc/testsuite/g++.dg/pph/c0funcstatic.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0funcstatic.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0funcstatic.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef C1FUNCSTATIC_H > -#define C1FUNCSTATIC_H > +#ifndef C0FUNCSTATIC_H > +#define C0FUNCSTATIC_H > static int f() { > static int x = 3; > return x++; > Index: gcc/testsuite/g++.dg/pph/c0meteor-contest.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0meteor-contest.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0meteor-contest.h (working copy) > @@ -1,6 +1,6 @@ > /* { dg-options "-w" } */ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > +#ifndef C0METEOR_CONTEST_H > +#define C0METEOR_CONTEST_H > /* > Redistribution and use in source and binary forms, with or without > modification, are permitted provided that the following conditions are met: > @@ -36,9 +36,9 @@ POSSIBILITY OF SUCH DAMAGE. > * contributed by Christian Vosteen > */ > > -/* Simplified version of c2meteor-contest.h - Do not include other system > - headers here. Simply forward declare the library functions used > - by this header. */ > +/* Simplified version of c4meteor-contest.h > + - Do not include other system headers here. > + Simply forward declare the library functions used by this header. */ > extern "C" { > typedef __SIZE_TYPE__ size_t; > void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); > Index: gcc/testsuite/g++.dg/pph/c1variables.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1variables.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1variables.h (working copy) > @@ -1,7 +0,0 @@ > -#ifndef C1VARIABLES_H > -#define C1VARIABLES_H > -extern int gbl_init_extern; > -extern int gbl_uninit_extern; > -int gbl_tentative; > -extern const int gbl_extern_const; > -#endif > Index: gcc/testsuite/g++.dg/pph/c1meteor-contest.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1meteor-contest.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1meteor-contest.h (working copy) > @@ -1,625 +0,0 @@ > -/* { dg-options "-w" } */ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > -/* > -Redistribution and use in source and binary forms, with or without > -modification, are permitted provided that the following conditions are met: > - > - * Redistributions of source code must retain the above copyright > - notice, this list of conditions and the following disclaimer. > - > - * Redistributions in binary form must reproduce the above copyright > - notice, this list of conditions and the following disclaimer in the > - documentation and/or other materials provided with the distribution. > - > - * Neither the name of "The Computer Language Benchmarks Game" nor the > - name of "The Computer Language Shootout Benchmarks" nor the names of > - its contributors may be used to endorse or promote products derived > - from this software without specific prior written permission. > - > -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" > -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE > -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > -POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* The Computer Language Benchmarks Game > - * http://shootout.alioth.debian.org/ > - * > - * contributed by Christian Vosteen > - */ > - > -/* Simplified version of c2meteor-contest.h - Do not include other system > - headers here. Simply forward declare the library functions used > - by this header. */ > -extern "C" { > - typedef __SIZE_TYPE__ size_t; > - void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); > - int printf(const char *, ...); > - int atoi(const char *); > -} > - > -#define TRUE 1 > -#define FALSE 0 > - > -/* The board is a 50 cell hexagonal pattern. For . . . . . > - * maximum speed the board will be implemented as . . . . . > - * 50 bits, which will fit into a 64 bit long long . . . . . > - * int. . . . . . > - * . . . . . > - * I will represent 0's as empty cells and 1's . . . . . > - * as full cells. . . . . . > - * . . . . . > - * . . . . . > - * . . . . . > - */ > - > -unsigned long long board = 0xFFFC000000000000ULL; > - > -/* The puzzle pieces must be specified by the path followed > - * from one end to the other along 12 hexagonal directions. > - * > - * Piece 0 Piece 1 Piece 2 Piece 3 Piece 4 > - * > - * O O O O O O O O O O O O O O O > - * O O O O O O O > - * O O O > - * > - * Piece 5 Piece 6 Piece 7 Piece 8 Piece 9 > - * > - * O O O O O O O O O O O O O > - * O O O O O O O O O > - * O O O > - * > - * I had to make it 12 directions because I wanted all of the > - * piece definitions to fit into the same size arrays. It is > - * not possible to define piece 4 in terms of the 6 cardinal > - * directions in 4 moves. > - */ > - > -#define E 0 > -#define ESE 1 > -#define SE 2 > -#define S 3 > -#define SW 4 > -#define WSW 5 > -#define W 6 > -#define WNW 7 > -#define NW 8 > -#define N 9 > -#define NE 10 > -#define ENE 11 > -#define PIVOT 12 > - > -char piece_def[10][4] = { > - { E, E, E, SE}, > - { SE, E, NE, E}, > - { E, E, SE, SW}, > - { E, E, SW, SE}, > - { SE, E, NE, S}, > - { E, E, SW, E}, > - { E, SE, SE, NE}, > - { E, SE, SE, W}, > - { E, SE, E, E}, > - { E, E, E, SW} > -}; > - > - > -/* To minimize the amount of work done in the recursive solve function below, > - * I'm going to allocate enough space for all legal rotations of each piece > - * at each position on the board. That's 10 pieces x 50 board positions x > - * 12 rotations. However, not all 12 rotations will fit on every cell, so > - * I'll have to keep count of the actual number that do. > - * The pieces are going to be unsigned long long ints just like the board so > - * they can be bitwise-anded with the board to determine if they fit. > - * I'm also going to record the next possible open cell for each piece and > - * location to reduce the burden on the solve function. > - */ > -unsigned long long pieces[10][50][12]; > -int piece_counts[10][50]; > -char next_cell[10][50][12]; > - > -/* Returns the direction rotated 60 degrees clockwise */ > -char rotate(char dir) { > - return (dir + 2) % PIVOT; > -} > - > -/* Returns the direction flipped on the horizontal axis */ > -char flip(char dir) { > - return (PIVOT - dir) % PIVOT; > -} > - > - > -/* Returns the new cell index from the specified cell in the > - * specified direction. The index is only valid if the > - * starting cell and direction have been checked by the > - * out_of_bounds function first. > - */ > -char shift(char cell, char dir) { > - switch(dir) { > - case E: > - return cell + 1; > - case ESE: > - if((cell / 5) % 2) > - return cell + 7; > - else > - return cell + 6; > - case SE: > - if((cell / 5) % 2) > - return cell + 6; > - else > - return cell + 5; > - case S: > - return cell + 10; > - case SW: > - if((cell / 5) % 2) > - return cell + 5; > - else > - return cell + 4; > - case WSW: > - if((cell / 5) % 2) > - return cell + 4; > - else > - return cell + 3; > - case W: > - return cell - 1; > - case WNW: > - if((cell / 5) % 2) > - return cell - 6; > - else > - return cell - 7; > - case NW: > - if((cell / 5) % 2) > - return cell - 5; > - else > - return cell - 6; > - case N: > - return cell - 10; > - case NE: > - if((cell / 5) % 2) > - return cell - 4; > - else > - return cell - 5; > - case ENE: > - if((cell / 5) % 2) > - return cell - 3; > - else > - return cell - 4; > - default: > - return cell; > - } > -} > - > -/* Returns wether the specified cell and direction will land outside > - * of the board. Used to determine if a piece is at a legal board > - * location or not. > - */ > -char out_of_bounds(char cell, char dir) { > - char i; > - switch(dir) { > - case E: > - return cell % 5 == 4; > - case ESE: > - i = cell % 10; > - return i == 4 || i == 8 || i == 9 || cell >= 45; > - case SE: > - return cell % 10 == 9 || cell >= 45; > - case S: > - return cell >= 40; > - case SW: > - return cell % 10 == 0 || cell >= 45; > - case WSW: > - i = cell % 10; > - return i == 0 || i == 1 || i == 5 || cell >= 45; > - case W: > - return cell % 5 == 0; > - case WNW: > - i = cell % 10; > - return i == 0 || i == 1 || i == 5 || cell < 5; > - case NW: > - return cell % 10 == 0 || cell < 5; > - case N: > - return cell < 10; > - case NE: > - return cell % 10 == 9 || cell < 5; > - case ENE: > - i = cell % 10; > - return i == 4 || i == 8 || i == 9 || cell < 5; > - default: > - return FALSE; > - } > -} > - > -/* Rotate a piece 60 degrees clockwise */ > -void rotate_piece(int piece) { > - int i; > - for(i = 0; i < 4; i++) > - piece_def[piece][i] = rotate(piece_def[piece][i]); > -} > - > -/* Flip a piece along the horizontal axis */ > -void flip_piece(int piece) { > - int i; > - for(i = 0; i < 4; i++) > - piece_def[piece][i] = flip(piece_def[piece][i]); > -} > - > -/* Convenience function to quickly calculate all of the indices for a piece */ > -void calc_cell_indices(char *cell, int piece, char index) { > - cell[0] = index; > - cell[1] = shift(cell[0], piece_def[piece][0]); > - cell[2] = shift(cell[1], piece_def[piece][1]); > - cell[3] = shift(cell[2], piece_def[piece][2]); > - cell[4] = shift(cell[3], piece_def[piece][3]); > -} > - > -/* Convenience function to quickly calculate if a piece fits on the board */ > -int cells_fit_on_board(char *cell, int piece) { > - return (!out_of_bounds(cell[0], piece_def[piece][0]) && > - !out_of_bounds(cell[1], piece_def[piece][1]) && > - !out_of_bounds(cell[2], piece_def[piece][2]) && > - !out_of_bounds(cell[3], piece_def[piece][3])); > -} > - > -/* Returns the lowest index of the cells of a piece. > - * I use the lowest index that a piece occupies as the index for looking up > - * the piece in the solve function. > - */ > -char minimum_of_cells(char *cell) { > - char minimum = cell[0]; > - minimum = cell[1] < minimum ? cell[1] : minimum; > - minimum = cell[2] < minimum ? cell[2] : minimum; > - minimum = cell[3] < minimum ? cell[3] : minimum; > - minimum = cell[4] < minimum ? cell[4] : minimum; > - return minimum; > -} > - > -/* Calculate the lowest possible open cell if the piece is placed on the board. > - * Used to later reduce the amount of time searching for open cells in the > - * solve function. > - */ > -char first_empty_cell(char *cell, char minimum) { > - char first_empty = minimum; > - while(first_empty == cell[0] || first_empty == cell[1] || > - first_empty == cell[2] || first_empty == cell[3] || > - first_empty == cell[4]) > - first_empty++; > - return first_empty; > -} > - > -/* Generate the unsigned long long int that will later be anded with the > - * board to determine if it fits. > - */ > -unsigned long long bitmask_from_cells(char *cell) { > - unsigned long long piece_mask = 0ULL; > - int i; > - for(i = 0; i < 5; i++) > - piece_mask |= 1ULL << cell[i]; > - return piece_mask; > -} > - > -/* Record the piece and other important information in arrays that will > - * later be used by the solve function. > - */ > -void record_piece(int piece, int minimum, char first_empty, > - unsigned long long piece_mask) { > - pieces[piece][minimum][piece_counts[piece][minimum]] = piece_mask; > - next_cell[piece][minimum][piece_counts[piece][minimum]] = first_empty; > - piece_counts[piece][minimum]++; > -} > - > - > -/* Fill the entire board going cell by cell. If any cells are "trapped" > - * they will be left alone. > - */ > -void fill_contiguous_space(char *board, int index) { > - if(board[index] == 1) > - return; > - board[index] = 1; > - if(!out_of_bounds(index, E)) > - fill_contiguous_space(board, shift(index, E)); > - if(!out_of_bounds(index, SE)) > - fill_contiguous_space(board, shift(index, SE)); > - if(!out_of_bounds(index, SW)) > - fill_contiguous_space(board, shift(index, SW)); > - if(!out_of_bounds(index, W)) > - fill_contiguous_space(board, shift(index, W)); > - if(!out_of_bounds(index, NW)) > - fill_contiguous_space(board, shift(index, NW)); > - if(!out_of_bounds(index, NE)) > - fill_contiguous_space(board, shift(index, NE)); > -} > - > - > -/* To thin the number of pieces, I calculate if any of them trap any empty > - * cells at the edges. There are only a handful of exceptions where the > - * the board can be solved with the trapped cells. For example: piece 8 can > - * trap 5 cells in the corner, but piece 3 can fit in those cells, or piece 0 > - * can split the board in half where both halves are viable. > - */ > -int has_island(char *cell, int piece) { > - char temp_board[50]; > - char c; > - int i; > - for(i = 0; i < 50; i++) > - temp_board[i] = 0; > - for(i = 0; i < 5; i++) > - temp_board[((int)cell[i])] = 1; > - i = 49; > - while(temp_board[i] == 1) > - i--; > - fill_contiguous_space(temp_board, i); > - c = 0; > - for(i = 0; i < 50; i++) > - if(temp_board[i] == 0) > - c++; > - if(c == 0 || (c == 5 && piece == 8) || (c == 40 && piece == 8) || > - (c % 5 == 0 && piece == 0)) > - return FALSE; > - else > - return TRUE; > -} > - > - > -/* Calculate all six rotations of the specified piece at the specified index. > - * We calculate only half of piece 3's rotations. This is because any solution > - * found has an identical solution rotated 180 degrees. Thus we can reduce the > - * number of attempted pieces in the solve algorithm by not including the 180- > - * degree-rotated pieces of ONE of the pieces. I chose piece 3 because it gave > - * me the best time ;) > - */ > - void calc_six_rotations(char piece, char index) { > - char rotation, cell[5]; > - char minimum, first_empty; > - unsigned long long piece_mask; > - > - for(rotation = 0; rotation < 6; rotation++) { > - if(piece != 3 || rotation < 3) { > - calc_cell_indices(cell, piece, index); > - if(cells_fit_on_board(cell, piece) && !has_island(cell, piece)) { > - minimum = minimum_of_cells(cell); > - first_empty = first_empty_cell(cell, minimum); > - piece_mask = bitmask_from_cells(cell); > - record_piece(piece, minimum, first_empty, piece_mask); > - } > - } > - rotate_piece(piece); > - } > -} > - > -/* Calculate every legal rotation for each piece at each board location. */ > -void calc_pieces(void) { > - char piece, index; > - > - for(piece = 0; piece < 10; piece++) { > - for(index = 0; index < 50; index++) { > - calc_six_rotations(piece, index); > - flip_piece(piece); > - calc_six_rotations(piece, index); > - } > - } > -} > - > - > - > -/* Calculate all 32 possible states for a 5-bit row and all rows that will > - * create islands that follow any of the 32 possible rows. These pre- > - * calculated 5-bit rows will be used to find islands in a partially solved > - * board in the solve function. > - */ > -#define ROW_MASK 0x1F > -#define TRIPLE_MASK 0x7FFF > -char all_rows[32] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, > - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}; > -int bad_even_rows[32][32]; > -int bad_odd_rows[32][32]; > -int bad_even_triple[32768]; > -int bad_odd_triple[32768]; > - > -int rows_bad(char row1, char row2, int even) { > - /* even is referring to row1 */ > - int i, in_zeroes, group_okay; > - char block, row2_shift; > - /* Test for blockages at same index and shifted index */ > - if(even) > - row2_shift = ((row2 << 1) & ROW_MASK) | 0x01; > - else > - row2_shift = (row2 >> 1) | 0x10; > - block = ((row1 ^ row2) & row2) & ((row1 ^ row2_shift) & row2_shift); > - /* Test for groups of 0's */ > - in_zeroes = FALSE; > - group_okay = FALSE; > - for(i = 0; i < 5; i++) { > - if(row1 & (1 << i)) { > - if(in_zeroes) { > - if(!group_okay) > - return TRUE; > - in_zeroes = FALSE; > - group_okay = FALSE; > - } > - } else { > - if(!in_zeroes) > - in_zeroes = TRUE; > - if(!(block & (1 << i))) > - group_okay = TRUE; > - } > - } > - if(in_zeroes) > - return !group_okay; > - else > - return FALSE; > -} > - > -/* Check for cases where three rows checked sequentially cause a false > - * positive. One scenario is when 5 cells may be surrounded where piece 5 > - * or 7 can fit. The other scenario is when piece 2 creates a hook shape. > - */ > -int triple_is_okay(char row1, char row2, char row3, int even) { > - if(even) { > - /* There are four cases: > - * row1: 00011 00001 11001 10101 > - * row2: 01011 00101 10001 10001 > - * row3: 011?? 00110 ????? ????? > - */ > - return ((row1 == 0x03) && (row2 == 0x0B) && ((row3 & 0x1C) == 0x0C)) || > - ((row1 == 0x01) && (row2 == 0x05) && (row3 == 0x06)) || > - ((row1 == 0x19) && (row2 == 0x11)) || > - ((row1 == 0x15) && (row2 == 0x11)); > - } else { > - /* There are two cases: > - * row1: 10011 10101 > - * row2: 10001 10001 > - * row3: ????? ????? > - */ > - return ((row1 == 0x13) && (row2 == 0x11)) || > - ((row1 == 0x15) && (row2 == 0x11)); > - } > -} > - > - > -void calc_rows(void) { > - int row1, row2, row3; > - int result1, result2; > - for(row1 = 0; row1 < 32; row1++) { > - for(row2 = 0; row2 < 32; row2++) { > - bad_even_rows[row1][row2] = rows_bad(row1, row2, TRUE); > - bad_odd_rows[row1][row2] = rows_bad(row1, row2, FALSE); > - } > - } > - for(row1 = 0; row1 < 32; row1++) { > - for(row2 = 0; row2 < 32; row2++) { > - for(row3 = 0; row3 < 32; row3++) { > - result1 = bad_even_rows[row1][row2]; > - result2 = bad_odd_rows[row2][row3]; > - if(result1 == FALSE && result2 == TRUE > - && triple_is_okay(row1, row2, row3, TRUE)) > - bad_even_triple[row1+(row2*32)+(row3*1024)] = FALSE; > - else > - bad_even_triple[row1+(row2*32)+(row3*1024)] = result1 || result2; > - > - result1 = bad_odd_rows[row1][row2]; > - result2 = bad_even_rows[row2][row3]; > - if(result1 == FALSE && result2 == TRUE > - && triple_is_okay(row1, row2, row3, FALSE)) > - bad_odd_triple[row1+(row2*32)+(row3*1024)] = FALSE; > - else > - bad_odd_triple[row1+(row2*32)+(row3*1024)] = result1 || result2; > - } > - } > - } > -} > - > - > - > -/* Calculate islands while solving the board. > - */ > -int boardHasIslands(char cell) { > - /* Too low on board, don't bother checking */ > - if(cell >= 40) > - return FALSE; > - int current_triple = (board >> ((cell / 5) * 5)) & TRIPLE_MASK; > - if((cell / 5) % 2) > - return bad_odd_triple[current_triple]; > - else > - return bad_even_triple[current_triple]; > -} > - > - > -/* The recursive solve algorithm. Try to place each permutation in the upper- > - * leftmost empty cell. Mark off available pieces as it goes along. > - * Because the board is a bit mask, the piece number and bit mask must be saved > - * at each successful piece placement. This data is used to create a 50 char > - * array if a solution is found. > - */ > -short avail = 0x03FF; > -char sol_nums[10]; > -unsigned long long sol_masks[10]; > -signed char solutions[2100][50]; > -int solution_count = 0; > -int max_solutions = 2100; > - > -void record_solution(void) { > - int sol_no, index; > - unsigned long long sol_mask; > - for(sol_no = 0; sol_no < 10; sol_no++) { > - sol_mask = sol_masks[sol_no]; > - for(index = 0; index < 50; index++) { > - if(sol_mask & 1ULL) { > - solutions[solution_count][index] = sol_nums[sol_no]; > - /* Board rotated 180 degrees is a solution too! */ > - solutions[solution_count+1][49-index] = sol_nums[sol_no]; > - } > - sol_mask = sol_mask >> 1; > - } > - } > - solution_count += 2; > -} > - > -void solve(int depth, int cell) { > - int piece, rotation, max_rots; > - unsigned long long *piece_mask; > - short piece_no_mask; > - > - if(solution_count >= max_solutions) > - return; > - > - while(board & (1ULL << cell)) > - cell++; > - > - for(piece = 0; piece < 10; piece++) { > - piece_no_mask = 1 << piece; > - if(!(avail & piece_no_mask)) > - continue; > - avail ^= piece_no_mask; > - max_rots = piece_counts[piece][cell]; > - piece_mask = pieces[piece][cell]; > - for(rotation = 0; rotation < max_rots; rotation++) { > - if(!(board & *(piece_mask + rotation))) { > - sol_nums[depth] = piece; > - sol_masks[depth] = *(piece_mask + rotation); > - if(depth == 9) { > - /* Solution found!!!!!11!!ONE! */ > - record_solution(); > - avail ^= piece_no_mask; > - return; > - } > - board |= *(piece_mask + rotation); > - if(!boardHasIslands(next_cell[piece][cell][rotation])) > - solve(depth + 1, next_cell[piece][cell][rotation]); > - board ^= *(piece_mask + rotation); > - } > - } > - avail ^= piece_no_mask; > - } > -} > - > - > -/* qsort comparator - used to find first and last solutions */ > -int solution_sort(const void *elem1, const void *elem2) { > - signed char *char1 = (signed char *) elem1; > - signed char *char2 = (signed char *) elem2; > - int i = 0; > - while(i < 50 && char1[i] == char2[i]) > - i++; > - return char1[i] - char2[i]; > -} > - > - > -/* pretty print a board in the specified hexagonal format */ > -void pretty(signed char *b) { > - int i; > - for(i = 0; i < 50; i += 10) { > - printf("%c %c %c %c %c \n %c %c %c %c %c \n", b[i]+'0', b[i+1]+'0', > - b[i+2]+'0', b[i+3]+'0', b[i+4]+'0', b[i+5]+'0', b[i+6]+'0', > - b[i+7]+'0', b[i+8]+'0', b[i+9]+'0'); > - } > - printf("\n"); > -} > -#endif > Index: gcc/testsuite/g++.dg/pph/c2meteor-contest.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2meteor-contest.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2meteor-contest.h (working copy) > @@ -1,617 +0,0 @@ > -/* { dg-options "-w" } */ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > -/* > -Redistribution and use in source and binary forms, with or without > -modification, are permitted provided that the following conditions are met: > - > - * Redistributions of source code must retain the above copyright > - notice, this list of conditions and the following disclaimer. > - > - * Redistributions in binary form must reproduce the above copyright > - notice, this list of conditions and the following disclaimer in the > - documentation and/or other materials provided with the distribution. > - > - * Neither the name of "The Computer Language Benchmarks Game" nor the > - name of "The Computer Language Shootout Benchmarks" nor the names of > - its contributors may be used to endorse or promote products derived > - from this software without specific prior written permission. > - > -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" > -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE > -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > -POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* The Computer Language Benchmarks Game > - * http://shootout.alioth.debian.org/ > - * > - * contributed by Christian Vosteen > - */ > - > -#include <stdlib.h> > -#include <stdio.h> > -#define TRUE 1 > -#define FALSE 0 > - > -/* The board is a 50 cell hexagonal pattern. For . . . . . > - * maximum speed the board will be implemented as . . . . . > - * 50 bits, which will fit into a 64 bit long long . . . . . > - * int. . . . . . > - * . . . . . > - * I will represent 0's as empty cells and 1's . . . . . > - * as full cells. . . . . . > - * . . . . . > - * . . . . . > - * . . . . . > - */ > - > -unsigned long long board = 0xFFFC000000000000ULL; > - > -/* The puzzle pieces must be specified by the path followed > - * from one end to the other along 12 hexagonal directions. > - * > - * Piece 0 Piece 1 Piece 2 Piece 3 Piece 4 > - * > - * O O O O O O O O O O O O O O O > - * O O O O O O O > - * O O O > - * > - * Piece 5 Piece 6 Piece 7 Piece 8 Piece 9 > - * > - * O O O O O O O O O O O O O > - * O O O O O O O O O > - * O O O > - * > - * I had to make it 12 directions because I wanted all of the > - * piece definitions to fit into the same size arrays. It is > - * not possible to define piece 4 in terms of the 6 cardinal > - * directions in 4 moves. > - */ > - > -#define E 0 > -#define ESE 1 > -#define SE 2 > -#define S 3 > -#define SW 4 > -#define WSW 5 > -#define W 6 > -#define WNW 7 > -#define NW 8 > -#define N 9 > -#define NE 10 > -#define ENE 11 > -#define PIVOT 12 > - > -char piece_def[10][4] = { > - { E, E, E, SE}, > - { SE, E, NE, E}, > - { E, E, SE, SW}, > - { E, E, SW, SE}, > - { SE, E, NE, S}, > - { E, E, SW, E}, > - { E, SE, SE, NE}, > - { E, SE, SE, W}, > - { E, SE, E, E}, > - { E, E, E, SW} > -}; > - > - > -/* To minimize the amount of work done in the recursive solve function below, > - * I'm going to allocate enough space for all legal rotations of each piece > - * at each position on the board. That's 10 pieces x 50 board positions x > - * 12 rotations. However, not all 12 rotations will fit on every cell, so > - * I'll have to keep count of the actual number that do. > - * The pieces are going to be unsigned long long ints just like the board so > - * they can be bitwise-anded with the board to determine if they fit. > - * I'm also going to record the next possible open cell for each piece and > - * location to reduce the burden on the solve function. > - */ > -unsigned long long pieces[10][50][12]; > -int piece_counts[10][50]; > -char next_cell[10][50][12]; > - > -/* Returns the direction rotated 60 degrees clockwise */ > -char rotate(char dir) { > - return (dir + 2) % PIVOT; > -} > - > -/* Returns the direction flipped on the horizontal axis */ > -char flip(char dir) { > - return (PIVOT - dir) % PIVOT; > -} > - > - > -/* Returns the new cell index from the specified cell in the > - * specified direction. The index is only valid if the > - * starting cell and direction have been checked by the > - * out_of_bounds function first. > - */ > -char shift(char cell, char dir) { > - switch(dir) { > - case E: > - return cell + 1; > - case ESE: > - if((cell / 5) % 2) > - return cell + 7; > - else > - return cell + 6; > - case SE: > - if((cell / 5) % 2) > - return cell + 6; > - else > - return cell + 5; > - case S: > - return cell + 10; > - case SW: > - if((cell / 5) % 2) > - return cell + 5; > - else > - return cell + 4; > - case WSW: > - if((cell / 5) % 2) > - return cell + 4; > - else > - return cell + 3; > - case W: > - return cell - 1; > - case WNW: > - if((cell / 5) % 2) > - return cell - 6; > - else > - return cell - 7; > - case NW: > - if((cell / 5) % 2) > - return cell - 5; > - else > - return cell - 6; > - case N: > - return cell - 10; > - case NE: > - if((cell / 5) % 2) > - return cell - 4; > - else > - return cell - 5; > - case ENE: > - if((cell / 5) % 2) > - return cell - 3; > - else > - return cell - 4; > - default: > - return cell; > - } > -} > - > -/* Returns wether the specified cell and direction will land outside > - * of the board. Used to determine if a piece is at a legal board > - * location or not. > - */ > -char out_of_bounds(char cell, char dir) { > - char i; > - switch(dir) { > - case E: > - return cell % 5 == 4; > - case ESE: > - i = cell % 10; > - return i == 4 || i == 8 || i == 9 || cell >= 45; > - case SE: > - return cell % 10 == 9 || cell >= 45; > - case S: > - return cell >= 40; > - case SW: > - return cell % 10 == 0 || cell >= 45; > - case WSW: > - i = cell % 10; > - return i == 0 || i == 1 || i == 5 || cell >= 45; > - case W: > - return cell % 5 == 0; > - case WNW: > - i = cell % 10; > - return i == 0 || i == 1 || i == 5 || cell < 5; > - case NW: > - return cell % 10 == 0 || cell < 5; > - case N: > - return cell < 10; > - case NE: > - return cell % 10 == 9 || cell < 5; > - case ENE: > - i = cell % 10; > - return i == 4 || i == 8 || i == 9 || cell < 5; > - default: > - return FALSE; > - } > -} > - > -/* Rotate a piece 60 degrees clockwise */ > -void rotate_piece(int piece) { > - int i; > - for(i = 0; i < 4; i++) > - piece_def[piece][i] = rotate(piece_def[piece][i]); > -} > - > -/* Flip a piece along the horizontal axis */ > -void flip_piece(int piece) { > - int i; > - for(i = 0; i < 4; i++) > - piece_def[piece][i] = flip(piece_def[piece][i]); > -} > - > -/* Convenience function to quickly calculate all of the indices for a piece */ > -void calc_cell_indices(char *cell, int piece, char index) { > - cell[0] = index; > - cell[1] = shift(cell[0], piece_def[piece][0]); > - cell[2] = shift(cell[1], piece_def[piece][1]); > - cell[3] = shift(cell[2], piece_def[piece][2]); > - cell[4] = shift(cell[3], piece_def[piece][3]); > -} > - > -/* Convenience function to quickly calculate if a piece fits on the board */ > -int cells_fit_on_board(char *cell, int piece) { > - return (!out_of_bounds(cell[0], piece_def[piece][0]) && > - !out_of_bounds(cell[1], piece_def[piece][1]) && > - !out_of_bounds(cell[2], piece_def[piece][2]) && > - !out_of_bounds(cell[3], piece_def[piece][3])); > -} > - > -/* Returns the lowest index of the cells of a piece. > - * I use the lowest index that a piece occupies as the index for looking up > - * the piece in the solve function. > - */ > -char minimum_of_cells(char *cell) { > - char minimum = cell[0]; > - minimum = cell[1] < minimum ? cell[1] : minimum; > - minimum = cell[2] < minimum ? cell[2] : minimum; > - minimum = cell[3] < minimum ? cell[3] : minimum; > - minimum = cell[4] < minimum ? cell[4] : minimum; > - return minimum; > -} > - > -/* Calculate the lowest possible open cell if the piece is placed on the board. > - * Used to later reduce the amount of time searching for open cells in the > - * solve function. > - */ > -char first_empty_cell(char *cell, char minimum) { > - char first_empty = minimum; > - while(first_empty == cell[0] || first_empty == cell[1] || > - first_empty == cell[2] || first_empty == cell[3] || > - first_empty == cell[4]) > - first_empty++; > - return first_empty; > -} > - > -/* Generate the unsigned long long int that will later be anded with the > - * board to determine if it fits. > - */ > -unsigned long long bitmask_from_cells(char *cell) { > - unsigned long long piece_mask = 0ULL; > - int i; > - for(i = 0; i < 5; i++) > - piece_mask |= 1ULL << cell[i]; > - return piece_mask; > -} > - > -/* Record the piece and other important information in arrays that will > - * later be used by the solve function. > - */ > -void record_piece(int piece, int minimum, char first_empty, > - unsigned long long piece_mask) { > - pieces[piece][minimum][piece_counts[piece][minimum]] = piece_mask; > - next_cell[piece][minimum][piece_counts[piece][minimum]] = first_empty; > - piece_counts[piece][minimum]++; > -} > - > - > -/* Fill the entire board going cell by cell. If any cells are "trapped" > - * they will be left alone. > - */ > -void fill_contiguous_space(char *board, int index) { > - if(board[index] == 1) > - return; > - board[index] = 1; > - if(!out_of_bounds(index, E)) > - fill_contiguous_space(board, shift(index, E)); > - if(!out_of_bounds(index, SE)) > - fill_contiguous_space(board, shift(index, SE)); > - if(!out_of_bounds(index, SW)) > - fill_contiguous_space(board, shift(index, SW)); > - if(!out_of_bounds(index, W)) > - fill_contiguous_space(board, shift(index, W)); > - if(!out_of_bounds(index, NW)) > - fill_contiguous_space(board, shift(index, NW)); > - if(!out_of_bounds(index, NE)) > - fill_contiguous_space(board, shift(index, NE)); > -} > - > - > -/* To thin the number of pieces, I calculate if any of them trap any empty > - * cells at the edges. There are only a handful of exceptions where the > - * the board can be solved with the trapped cells. For example: piece 8 can > - * trap 5 cells in the corner, but piece 3 can fit in those cells, or piece 0 > - * can split the board in half where both halves are viable. > - */ > -int has_island(char *cell, int piece) { > - char temp_board[50]; > - char c; > - int i; > - for(i = 0; i < 50; i++) > - temp_board[i] = 0; > - for(i = 0; i < 5; i++) > - temp_board[((int)cell[i])] = 1; > - i = 49; > - while(temp_board[i] == 1) > - i--; > - fill_contiguous_space(temp_board, i); > - c = 0; > - for(i = 0; i < 50; i++) > - if(temp_board[i] == 0) > - c++; > - if(c == 0 || (c == 5 && piece == 8) || (c == 40 && piece == 8) || > - (c % 5 == 0 && piece == 0)) > - return FALSE; > - else > - return TRUE; > -} > - > - > -/* Calculate all six rotations of the specified piece at the specified index. > - * We calculate only half of piece 3's rotations. This is because any solution > - * found has an identical solution rotated 180 degrees. Thus we can reduce the > - * number of attempted pieces in the solve algorithm by not including the 180- > - * degree-rotated pieces of ONE of the pieces. I chose piece 3 because it gave > - * me the best time ;) > - */ > - void calc_six_rotations(char piece, char index) { > - char rotation, cell[5]; > - char minimum, first_empty; > - unsigned long long piece_mask; > - > - for(rotation = 0; rotation < 6; rotation++) { > - if(piece != 3 || rotation < 3) { > - calc_cell_indices(cell, piece, index); > - if(cells_fit_on_board(cell, piece) && !has_island(cell, piece)) { > - minimum = minimum_of_cells(cell); > - first_empty = first_empty_cell(cell, minimum); > - piece_mask = bitmask_from_cells(cell); > - record_piece(piece, minimum, first_empty, piece_mask); > - } > - } > - rotate_piece(piece); > - } > -} > - > -/* Calculate every legal rotation for each piece at each board location. */ > -void calc_pieces(void) { > - char piece, index; > - > - for(piece = 0; piece < 10; piece++) { > - for(index = 0; index < 50; index++) { > - calc_six_rotations(piece, index); > - flip_piece(piece); > - calc_six_rotations(piece, index); > - } > - } > -} > - > - > - > -/* Calculate all 32 possible states for a 5-bit row and all rows that will > - * create islands that follow any of the 32 possible rows. These pre- > - * calculated 5-bit rows will be used to find islands in a partially solved > - * board in the solve function. > - */ > -#define ROW_MASK 0x1F > -#define TRIPLE_MASK 0x7FFF > -char all_rows[32] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, > - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}; > -int bad_even_rows[32][32]; > -int bad_odd_rows[32][32]; > -int bad_even_triple[32768]; > -int bad_odd_triple[32768]; > - > -int rows_bad(char row1, char row2, int even) { > - /* even is referring to row1 */ > - int i, in_zeroes, group_okay; > - char block, row2_shift; > - /* Test for blockages at same index and shifted index */ > - if(even) > - row2_shift = ((row2 << 1) & ROW_MASK) | 0x01; > - else > - row2_shift = (row2 >> 1) | 0x10; > - block = ((row1 ^ row2) & row2) & ((row1 ^ row2_shift) & row2_shift); > - /* Test for groups of 0's */ > - in_zeroes = FALSE; > - group_okay = FALSE; > - for(i = 0; i < 5; i++) { > - if(row1 & (1 << i)) { > - if(in_zeroes) { > - if(!group_okay) > - return TRUE; > - in_zeroes = FALSE; > - group_okay = FALSE; > - } > - } else { > - if(!in_zeroes) > - in_zeroes = TRUE; > - if(!(block & (1 << i))) > - group_okay = TRUE; > - } > - } > - if(in_zeroes) > - return !group_okay; > - else > - return FALSE; > -} > - > -/* Check for cases where three rows checked sequentially cause a false > - * positive. One scenario is when 5 cells may be surrounded where piece 5 > - * or 7 can fit. The other scenario is when piece 2 creates a hook shape. > - */ > -int triple_is_okay(char row1, char row2, char row3, int even) { > - if(even) { > - /* There are four cases: > - * row1: 00011 00001 11001 10101 > - * row2: 01011 00101 10001 10001 > - * row3: 011?? 00110 ????? ????? > - */ > - return ((row1 == 0x03) && (row2 == 0x0B) && ((row3 & 0x1C) == 0x0C)) || > - ((row1 == 0x01) && (row2 == 0x05) && (row3 == 0x06)) || > - ((row1 == 0x19) && (row2 == 0x11)) || > - ((row1 == 0x15) && (row2 == 0x11)); > - } else { > - /* There are two cases: > - * row1: 10011 10101 > - * row2: 10001 10001 > - * row3: ????? ????? > - */ > - return ((row1 == 0x13) && (row2 == 0x11)) || > - ((row1 == 0x15) && (row2 == 0x11)); > - } > -} > - > - > -void calc_rows(void) { > - int row1, row2, row3; > - int result1, result2; > - for(row1 = 0; row1 < 32; row1++) { > - for(row2 = 0; row2 < 32; row2++) { > - bad_even_rows[row1][row2] = rows_bad(row1, row2, TRUE); > - bad_odd_rows[row1][row2] = rows_bad(row1, row2, FALSE); > - } > - } > - for(row1 = 0; row1 < 32; row1++) { > - for(row2 = 0; row2 < 32; row2++) { > - for(row3 = 0; row3 < 32; row3++) { > - result1 = bad_even_rows[row1][row2]; > - result2 = bad_odd_rows[row2][row3]; > - if(result1 == FALSE && result2 == TRUE > - && triple_is_okay(row1, row2, row3, TRUE)) > - bad_even_triple[row1+(row2*32)+(row3*1024)] = FALSE; > - else > - bad_even_triple[row1+(row2*32)+(row3*1024)] = result1 || result2; > - > - result1 = bad_odd_rows[row1][row2]; > - result2 = bad_even_rows[row2][row3]; > - if(result1 == FALSE && result2 == TRUE > - && triple_is_okay(row1, row2, row3, FALSE)) > - bad_odd_triple[row1+(row2*32)+(row3*1024)] = FALSE; > - else > - bad_odd_triple[row1+(row2*32)+(row3*1024)] = result1 || result2; > - } > - } > - } > -} > - > - > - > -/* Calculate islands while solving the board. > - */ > -int boardHasIslands(char cell) { > - /* Too low on board, don't bother checking */ > - if(cell >= 40) > - return FALSE; > - int current_triple = (board >> ((cell / 5) * 5)) & TRIPLE_MASK; > - if((cell / 5) % 2) > - return bad_odd_triple[current_triple]; > - else > - return bad_even_triple[current_triple]; > -} > - > - > -/* The recursive solve algorithm. Try to place each permutation in the upper- > - * leftmost empty cell. Mark off available pieces as it goes along. > - * Because the board is a bit mask, the piece number and bit mask must be saved > - * at each successful piece placement. This data is used to create a 50 char > - * array if a solution is found. > - */ > -short avail = 0x03FF; > -char sol_nums[10]; > -unsigned long long sol_masks[10]; > -signed char solutions[2100][50]; > -int solution_count = 0; > -int max_solutions = 2100; > - > -void record_solution(void) { > - int sol_no, index; > - unsigned long long sol_mask; > - for(sol_no = 0; sol_no < 10; sol_no++) { > - sol_mask = sol_masks[sol_no]; > - for(index = 0; index < 50; index++) { > - if(sol_mask & 1ULL) { > - solutions[solution_count][index] = sol_nums[sol_no]; > - /* Board rotated 180 degrees is a solution too! */ > - solutions[solution_count+1][49-index] = sol_nums[sol_no]; > - } > - sol_mask = sol_mask >> 1; > - } > - } > - solution_count += 2; > -} > - > -void solve(int depth, int cell) { > - int piece, rotation, max_rots; > - unsigned long long *piece_mask; > - short piece_no_mask; > - > - if(solution_count >= max_solutions) > - return; > - > - while(board & (1ULL << cell)) > - cell++; > - > - for(piece = 0; piece < 10; piece++) { > - piece_no_mask = 1 << piece; > - if(!(avail & piece_no_mask)) > - continue; > - avail ^= piece_no_mask; > - max_rots = piece_counts[piece][cell]; > - piece_mask = pieces[piece][cell]; > - for(rotation = 0; rotation < max_rots; rotation++) { > - if(!(board & *(piece_mask + rotation))) { > - sol_nums[depth] = piece; > - sol_masks[depth] = *(piece_mask + rotation); > - if(depth == 9) { > - /* Solution found!!!!!11!!ONE! */ > - record_solution(); > - avail ^= piece_no_mask; > - return; > - } > - board |= *(piece_mask + rotation); > - if(!boardHasIslands(next_cell[piece][cell][rotation])) > - solve(depth + 1, next_cell[piece][cell][rotation]); > - board ^= *(piece_mask + rotation); > - } > - } > - avail ^= piece_no_mask; > - } > -} > - > - > -/* qsort comparator - used to find first and last solutions */ > -int solution_sort(const void *elem1, const void *elem2) { > - signed char *char1 = (signed char *) elem1; > - signed char *char2 = (signed char *) elem2; > - int i = 0; > - while(i < 50 && char1[i] == char2[i]) > - i++; > - return char1[i] - char2[i]; > -} > - > - > -/* pretty print a board in the specified hexagonal format */ > -void pretty(signed char *b) { > - int i; > - for(i = 0; i < 50; i += 10) { > - printf("%c %c %c %c %c \n %c %c %c %c %c \n", b[i]+'0', b[i+1]+'0', > - b[i+2]+'0', b[i+3]+'0', b[i+4]+'0', b[i+5]+'0', b[i+6]+'0', > - b[i+7]+'0', b[i+8]+'0', b[i+9]+'0'); > - } > - printf("\n"); > -} > -#endif > Index: gcc/testsuite/g++.dg/pph/c1funcmac.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1funcmac.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1funcmac.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "c1funcmac.h" > +#include "c0funcmac.h" > #define outer(major, minor) inner(major, minor) > void outer(long one, short two) { } > major(three); > Index: gcc/testsuite/g++.dg/pph/a1dynarray-use2.cci > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-use2.cci (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-use2.cci (working copy) > @@ -1,10 +0,0 @@ > - integer_array target(8); > - integer_array::iterator tgt( target.begin() ); > - const integer* srt = &sorted.front(); > - for ( ; tgt != target.end(); ++tgt ) { > - *tgt = *srt; > - if ( srt == &sorted.back() ) > - srt = &sorted.front(); > - else > - ++srt; > - } > Index: gcc/testsuite/g++.dg/pph/x1autometh.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1autometh.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1autometh.h (working copy) > @@ -1,9 +0,0 @@ > -#ifndef X1AUTOMETH_H > -#define X1AUTOMETH_H > -class base { > - virtual int method() { > - return 0; > - } > - int field; > -}; > -#endif > Index: gcc/testsuite/g++.dg/pph/c4meteor-contest.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c4meteor-contest.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c4meteor-contest.h (working copy) > @@ -1,6 +1,6 @@ > /* { dg-options "-w" } */ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > +#ifndef C4METEOR_CONTEST_H > +#define C4METEOR_CONTEST_H > /* > Redistribution and use in source and binary forms, with or without > modification, are permitted provided that the following conditions are met: > Index: gcc/testsuite/g++.dg/pph/x0overload2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0overload2.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0overload2.h (working copy) > @@ -1,4 +1,4 @@ > -#ifndef X2OVERLOAD2_H > -#define X2OVERLOAD2_H > +#ifndef X0OVERLOAD2_H > +#define X0OVERLOAD2_H > int o(float x); > #endif > Index: gcc/testsuite/g++.dg/pph/x1globalref.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1globalref.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1globalref.h (working copy) > @@ -1,7 +0,0 @@ > -#ifndef X1GLOBALREF_H > -#define X1GLOBALREF_H > -typedef int type; > -const type n = 3; > -const type m = 4; > -type a[n+m]; > -#endif > Index: gcc/testsuite/g++.dg/pph/c1varorder.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1varorder.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1varorder.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "c1varorder.h" > +#include "c0varorder.h" > > int foo(void) > { > Index: gcc/testsuite/g++.dg/pph/x1struct1.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1struct1.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1struct1.cc (working copy) > @@ -1,10 +0,0 @@ > -#include "x1struct1.h" > - > -type D::method() > -{ static int x = 2; > - return fld + mbr; } > - > -type D::mbr = 4; > -typedef D D2; > -D2 var1; > -D2 var2 = var1; > Index: gcc/testsuite/g++.dg/pph/c0empty.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0empty.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0empty.h (working copy) > @@ -1,3 +1,3 @@ > -#ifndef C1EMPTY_H > -#define C1EMPTY_H > +#ifndef C0EMPTY_H > +#define C0EMPTY_H > #endif > Index: gcc/testsuite/g++.dg/pph/c1limits-externalid.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1limits-externalid.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1limits-externalid.h (working copy) > @@ -1,18 +0,0 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > -#define LIM1(x) x##0; x##1; x##2; x##3; x##4; x##5; x##6; x##7; x##8; x##9; > -#define LIM2(x) LIM1(x##0) LIM1(x##1) LIM1(x##2) LIM1(x##3) LIM1(x##4) \ > - LIM1(x##5) LIM1(x##6) LIM1(x##7) LIM1(x##8) LIM1(x##9) > -#define LIM3(x) LIM2(x##0) LIM2(x##1) LIM2(x##2) LIM2(x##3) LIM2(x##4) \ > - LIM2(x##5) LIM2(x##6) LIM2(x##7) LIM2(x##8) LIM2(x##9) > -#define LIM4(x) LIM3(x##0) LIM3(x##1) LIM3(x##2) LIM3(x##3) LIM3(x##4) \ > - LIM3(x##5) LIM3(x##6) LIM3(x##7) LIM3(x##8) LIM3(x##9) > -#define LIM5(x) LIM4(x##0) LIM4(x##1) LIM4(x##2) LIM4(x##3) LIM4(x##4) \ > - LIM4(x##5) LIM4(x##6) LIM4(x##7) LIM4(x##8) LIM4(x##9) > -#define LIM6(x) LIM5(x##0) LIM5(x##1) LIM5(x##2) LIM5(x##3) LIM5(x##4) \ > - LIM5(x##5) LIM5(x##6) LIM5(x##7) LIM5(x##8) LIM5(x##9) > -#define LIM7(x) LIM6(x##0) LIM6(x##1) LIM6(x##2) LIM6(x##3) LIM6(x##4) \ > - LIM6(x##5) LIM6(x##6) LIM6(x##7) LIM6(x##8) LIM6(x##9) > - > -LIM5(char t) > -#endif > Index: gcc/testsuite/g++.dg/pph/x0dynarray2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0dynarray2.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0dynarray2.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1DYNARRAY2_H > -#define X1DYNARRAY2_H > +#ifndef X0DYNARRAY2_H > +#define X0DYNARRAY2_H > > extern "C" void *memcpy(void *dest, const void *src, unsigned long n); > extern "C" void exit(int) throw(); > @@ -9,14 +9,14 @@ namespace tst { > template< typename T > > struct dynarray > { > - #include "a1dynarray-dcl1.hi" > - #include "a1dynarray-dcl2a.hi" > - #include "a1dynarray-dcl3.hi" > + #include "a0dynarray-dcl1.hi" > + #include "a0dynarray-dcl2a.hi" > + #include "a0dynarray-dcl3.hi" > }; > > -#include "a1dynarray-dfn1a.hi" > -#include "a1dynarray-dfn2a.hi" > -#include "a1dynarray-dfn3a.hi" > +#include "a0dynarray-dfn1a.hi" > +#include "a0dynarray-dfn2a.hi" > +#include "a0dynarray-dfn3a.hi" > > } // namespace tst > > Index: gcc/testsuite/g++.dg/pph/y2overload.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/y2overload.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/y2overload.cc (working copy) > @@ -1,9 +0,0 @@ > -#include "x2overload1.h" > -#include "x2overload2.h" > -#include "x2overload3.h" > -// { dg-error "inconsistent overload resolution" "" { xfail *-*-* } } > - > -int g() > -{ > - return f(); > -} > Index: gcc/testsuite/g++.dg/pph/c1typerefs.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1typerefs.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1typerefs.h (working copy) > @@ -1,7 +0,0 @@ > -#ifndef C1TYPEREFS_H > -#define C1TYPEREFS_H > -struct base { > - int field; > -}; > -base function(); > -#endif > Index: gcc/testsuite/g++.dg/pph/x1dynarray6.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray6.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray6.cc (working copy) > @@ -1,28 +0,0 @@ > -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } > -// { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } > -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } > -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } > - > -#include <algorithm> > -#include <iostream> > - > -#include "x1dynarray6.h" > - > -#include "a1integer.h" > -typedef tst::dynarray< integer > integer_array; > - > -#include "a1dynarray-hlp1.cci" > - > -int main() > -{ > - #include "a1dynarray-use1.cci" > - dump( source ); > - dump( sorted ); > - std::sort( sorted.begin(), sorted.end() ); > - dump( sorted ); > - #include "a1dynarray-use2.cci" > - dump( target ); > - #include "a1dynarray-use3b.cci" > - #include "a1dynarray-use4a.cci" > - return sum - 23; > -} > Index: gcc/testsuite/g++.dg/pph/c1variables.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1variables.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1variables.cc (working copy) > @@ -1,4 +1,4 @@ > -#include "c1variables.h" > +#include "c0variables.h" > > int gbl_initial = 1; > const float gbl_init_const = 1.5; > Index: gcc/testsuite/g++.dg/pph/c1meteor-contest.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1meteor-contest.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1meteor-contest.cc (working copy) > @@ -1,7 +1,7 @@ > /* { dg-options "-w" } */ > /* { dg-do run } */ > > -#include "c1meteor-contest.h" > +#include "c0meteor-contest.h" > > int main(int argc, char **argv) { > if(argc > 1) > Index: gcc/testsuite/g++.dg/pph/c2eabi1.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2eabi1.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2eabi1.cc (working copy) > @@ -1,191 +0,0 @@ > -/* { dg-options "-w" } */ > -// pph asm xdiff > - > -#include "c2eabi1.h" > - > -int main () { > - unsigned char bytes[256]; > - int i, j, k, n; > - int *result; > - > - /* Table 2. Double-precision floating-point arithmetic. */ > - deq (__aeabi_dadd (dzero, done), done); > - deq (__aeabi_dadd (done, done), dtwo); > - deq (__aeabi_ddiv (dminus_four, dminus_two), dtwo); > - deq (__aeabi_ddiv (dminus_two, dtwo), dminus_one); > - deq (__aeabi_dmul (dtwo, dtwo), dfour); > - deq (__aeabi_dmul (dminus_one, dminus_two), dtwo); > - deq (__aeabi_dneg (dminus_one), done); > - deq (__aeabi_dneg (dfour), dminus_four); > - deq (__aeabi_drsub (done, dzero), dminus_one); > - deq (__aeabi_drsub (dtwo, dminus_two), dminus_four); > - deq (__aeabi_dsub (dzero, done), dminus_one); > - deq (__aeabi_dsub (dminus_two, dtwo), dminus_four); > - > - /* Table 3. Double-precision floating-point comparisons. */ > - ieq (__aeabi_dcmpeq (done, done), 1); > - ieq (__aeabi_dcmpeq (done, dzero), 0); > - ieq (__aeabi_dcmpeq (dNaN, dzero), 0); > - ieq (__aeabi_dcmpeq (dNaN, dNaN), 0); > - > - ieq (__aeabi_dcmplt (dzero, done), 1); > - ieq (__aeabi_dcmplt (done, dzero), 0); > - ieq (__aeabi_dcmplt (dzero, dzero), 0); > - ieq (__aeabi_dcmplt (dzero, dNaN), 0); > - ieq (__aeabi_dcmplt (dNaN, dNaN), 0); > - > - ieq (__aeabi_dcmple (dzero, done), 1); > - ieq (__aeabi_dcmple (done, dzero), 0); > - ieq (__aeabi_dcmple (dzero, dzero), 1); > - ieq (__aeabi_dcmple (dzero, dNaN), 0); > - ieq (__aeabi_dcmple (dNaN, dNaN), 0); > - > - ieq (__aeabi_dcmpge (dzero, done), 0); > - ieq (__aeabi_dcmpge (done, dzero), 1); > - ieq (__aeabi_dcmpge (dzero, dzero), 1); > - ieq (__aeabi_dcmpge (dzero, dNaN), 0); > - ieq (__aeabi_dcmpge (dNaN, dNaN), 0); > - > - ieq (__aeabi_dcmpgt (dzero, done), 0); > - ieq (__aeabi_dcmpgt (done, dzero), 1); > - ieq (__aeabi_dcmplt (dzero, dzero), 0); > - ieq (__aeabi_dcmpgt (dzero, dNaN), 0); > - ieq (__aeabi_dcmpgt (dNaN, dNaN), 0); > - > - ieq (__aeabi_dcmpun (done, done), 0); > - ieq (__aeabi_dcmpun (done, dzero), 0); > - ieq (__aeabi_dcmpun (dNaN, dzero), 1); > - ieq (__aeabi_dcmpun (dNaN, dNaN), 1); > - > - /* Table 4. Single-precision floating-point arithmetic. */ > - feq (__aeabi_fadd (fzero, fone), fone); > - feq (__aeabi_fadd (fone, fone), ftwo); > - feq (__aeabi_fdiv (fminus_four, fminus_two), ftwo); > - feq (__aeabi_fdiv (fminus_two, ftwo), fminus_one); > - feq (__aeabi_fmul (ftwo, ftwo), ffour); > - feq (__aeabi_fmul (fminus_one, fminus_two), ftwo); > - feq (__aeabi_fneg (fminus_one), fone); > - feq (__aeabi_fneg (ffour), fminus_four); > - feq (__aeabi_frsub (fone, fzero), fminus_one); > - feq (__aeabi_frsub (ftwo, fminus_two), fminus_four); > - feq (__aeabi_fsub (fzero, fone), fminus_one); > - feq (__aeabi_fsub (fminus_two, ftwo), fminus_four); > - > - /* Table 5. Single-precision floating-point comparisons. */ > - ieq (__aeabi_fcmpeq (fone, fone), 1); > - ieq (__aeabi_fcmpeq (fone, fzero), 0); > - ieq (__aeabi_fcmpeq (fNaN, fzero), 0); > - ieq (__aeabi_fcmpeq (fNaN, fNaN), 0); > - > - ieq (__aeabi_fcmplt (fzero, fone), 1); > - ieq (__aeabi_fcmplt (fone, fzero), 0); > - ieq (__aeabi_fcmplt (fzero, fzero), 0); > - ieq (__aeabi_fcmplt (fzero, fNaN), 0); > - ieq (__aeabi_fcmplt (fNaN, fNaN), 0); > - > - ieq (__aeabi_fcmple (fzero, fone), 1); > - ieq (__aeabi_fcmple (fone, fzero), 0); > - ieq (__aeabi_fcmple (fzero, fzero), 1); > - ieq (__aeabi_fcmple (fzero, fNaN), 0); > - ieq (__aeabi_fcmple (fNaN, fNaN), 0); > - > - ieq (__aeabi_fcmpge (fzero, fone), 0); > - ieq (__aeabi_fcmpge (fone, fzero), 1); > - ieq (__aeabi_fcmpge (fzero, fzero), 1); > - ieq (__aeabi_fcmpge (fzero, fNaN), 0); > - ieq (__aeabi_fcmpge (fNaN, fNaN), 0); > - > - ieq (__aeabi_fcmpgt (fzero, fone), 0); > - ieq (__aeabi_fcmpgt (fone, fzero), 1); > - ieq (__aeabi_fcmplt (fzero, fzero), 0); > - ieq (__aeabi_fcmpgt (fzero, fNaN), 0); > - ieq (__aeabi_fcmpgt (fNaN, fNaN), 0); > - > - ieq (__aeabi_fcmpun (fone, fone), 0); > - ieq (__aeabi_fcmpun (fone, fzero), 0); > - ieq (__aeabi_fcmpun (fNaN, fzero), 1); > - ieq (__aeabi_fcmpun (fNaN, fNaN), 1); > - > - /* Table 6. Floating-point to integer conversions. */ > - ieq (__aeabi_d2iz (dminus_one), -1); > - ueq (__aeabi_d2uiz (done), 1); > - leq (__aeabi_d2lz (dminus_two), -2LL); > - uleq (__aeabi_d2ulz (dfour), 4LL); > - ieq (__aeabi_f2iz (fminus_one), -1); > - ueq (__aeabi_f2uiz (fone), 1); > - leq (__aeabi_f2lz (fminus_two), -2LL); > - uleq (__aeabi_f2ulz (ffour), 4LL); > - > - /* Table 7. Conversions between floating types. */ > - feq (__aeabi_d2f (dtwo), ftwo); > - deq (__aeabi_f2d (fminus_four), dminus_four); > - > - /* Table 8. Integer to floating-point conversions. */ > - deq (__aeabi_i2d (-1), dminus_one); > - deq (__aeabi_ui2d (2), dtwo); > - deq (__aeabi_l2d (-1), dminus_one); > - deq (__aeabi_ul2d (2ULL), dtwo); > - feq (__aeabi_i2f (-1), fminus_one); > - feq (__aeabi_ui2f (2), ftwo); > - feq (__aeabi_l2f (-1), fminus_one); > - feq (__aeabi_ul2f (2ULL), ftwo); > - > - /* Table 9. Long long functions. */ > - leq (__aeabi_lmul (4LL, -1LL), -4LL); > - leq (__aeabi_llsl (2LL, 1), 4LL); > - leq (__aeabi_llsr (-1LL, 63), 1); > - leq (__aeabi_lasr (-1LL, 63), -1); > - > - result = lcmp_results; > - for (i = 0; i < NUM_CMP_VALUES; i++) > - for (j = 0; j < NUM_CMP_VALUES; j++) > - for (k = 0; k < NUM_CMP_VALUES; k++) > - for (n = 0; n < NUM_CMP_VALUES; n++) > - { > - ieq (signof (__aeabi_lcmp > - (((long long)cmp_val[i] << 32) | cmp_val[k], > - ((long long)cmp_val[j] << 32) | cmp_val[n])), > - *result); > - result++; > - } > - result = ulcmp_results; > - for (i = 0; i < NUM_CMP_VALUES; i++) > - for (j = 0; j < NUM_CMP_VALUES; j++) > - for (k = 0; k < NUM_CMP_VALUES; k++) > - for (n = 0; n < NUM_CMP_VALUES; n++) > - { > - ieq (signof (__aeabi_ulcmp > - (((long long)cmp_val[i] << 32) | cmp_val[k], > - ((long long)cmp_val[j] << 32) | cmp_val[n])), > - *result); > - result++; > - } > - > - ieq (__aeabi_idiv (-550, 11), -50); > - ueq (__aeabi_uidiv (4000000000U, 1000000U), 4000U); > - > - for (i = 0; i < 256; i++) > - bytes[i] = i; > - > -#ifdef __ARMEB__ > - ieq (__aeabi_uread4 (bytes + 1), 0x01020304U); > - leq (__aeabi_uread8 (bytes + 3), 0x030405060708090aLL); > - ieq (__aeabi_uwrite4 (0x66778899U, bytes + 5), 0x66778899U); > - leq (__aeabi_uwrite8 (0x2030405060708090LL, bytes + 15), > - 0x2030405060708090LL); > -#else > - ieq (__aeabi_uread4 (bytes + 1), 0x04030201U); > - leq (__aeabi_uread8 (bytes + 3), 0x0a09080706050403LL); > - ieq (__aeabi_uwrite4 (0x99887766U, bytes + 5), 0x99887766U); > - leq (__aeabi_uwrite8 (0x9080706050403020LL, bytes + 15), > - 0x9080706050403020LL); > -#endif > - > - for (i = 0; i < 4; i++) > - ieq (bytes[5 + i], (6 + i) * 0x11); > - > - for (i = 0; i < 8; i++) > - ieq (bytes[15 + i], (2 + i) * 0x10); > - > - exit (0); > -} > Index: gcc/testsuite/g++.dg/pph/x0namespace.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0namespace.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0namespace.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1NAMESPACE_H > -#define X1NAMESPACE_H > +#ifndef X0NAMESPACE_H > +#define X0NAMESPACE_H > namespace A { > extern int x; > struct B; > Index: gcc/testsuite/g++.dg/pph/c4eabi1.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c4eabi1.cc (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c4eabi1.cc (working copy) > @@ -1,8 +1,7 @@ > -// { dg-timeout 3 { target *-*-* } } > -// { dg-xfail-if "INFINITE" { "*-*-*" } { "-fpph-map=pph.map" } } > // { dg-options "-w -fpermissive" } > +// pph asm xdiff > > -#include "c2eabi1.h" > +#include "c4eabi1.h" > > int main () { > unsigned char bytes[256]; > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dcl4.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dcl4.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dcl4.hi (working copy) > @@ -1,11 +0,0 @@ > - typedef std::reverse_iterator<iterator> reverse_iterator; > - typedef std::reverse_iterator<const_iterator> const_reverse_iterator; > - > - reverse_iterator rbegin() > - { return reverse_iterator(end()); } > - const_reverse_iterator rbegin() const > - { return reverse_iterator(end()); } > - reverse_iterator rend() > - { return reverse_iterator(begin()); } > - const_reverse_iterator rend() const > - { return reverse_iterator(begin()); } > Index: gcc/testsuite/g++.dg/pph/c1pr36533.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1pr36533.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1pr36533.h (working copy) > @@ -1,176 +1,16 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > /* PR target/36533 */ > /* { dg-options "-w -fpermissive" } */ > + > +#ifndef C1PR36533_H > +#define C1PR36533_H > + > #include <string.h> > #include <sys/mman.h> > + > #ifndef MAP_ANONYMOUS > #define MAP_ANONYMOUS MAP_ANON > #endif > > -typedef struct S1 > -{ > - unsigned long s1; > - struct S1 *s2; > - char *s3; > -} S1; > - > -typedef struct > -{ > - unsigned int s4; > - unsigned int s5; > - int s6; > - unsigned int *s7; > -} S2; > - > -typedef struct > -{ > - unsigned int s8; > - unsigned short s9; > - unsigned char s10; > - unsigned char s11; > - char s12[255]; > -} S3; > - > -typedef struct > -{ > - unsigned int s4; > - unsigned short s13; > - unsigned short s14; > -} S4; > - > -typedef struct > -{ > - char s15[16]; > - unsigned long s16; > -} S5; > - > -typedef struct > -{ > - char s15[48]; > - S5 *s17; > -} S6; > - > -typedef struct > -{ > - S1 *s18; > -} S7; > - > -__attribute__((regparm (3), noinline)) int > -fn1 (const char *x, void *y, S1 *z) > -{ > - asm volatile ("" : : : "memory"); > - return *x + (y != 0); > -} > - > -__attribute__((regparm (3), noinline)) int > -fn2 (const char *x, int y, S2 *z) > -{ > - asm volatile ("" : : : "memory"); > - return 0; > -} > - > -static inline __attribute__ ((always_inline)) unsigned int > -fn4 (unsigned short x) > -{ > - unsigned len = x; > - if (len == ((1 << 16) - 1)) > - return 1 << 16; > - return len; > -} > - > -static inline __attribute__ ((always_inline)) S3 * > -fn3 (S3 *p) > -{ > - return (S3 *) ((char *) p + fn4 (p->s9)); > -} > - > -__attribute__((regparm (3), noinline)) int > -fn5 (void) > -{ > - asm volatile ("" : : : "memory"); > - return 0; > -} > - > -static inline __attribute__ ((always_inline)) int > -fn6 (S3 *w, int x, S2 *y, S4 *z) > -{ > - int a = 2; > - char *b = (char *) w; > - S2 c = *y; > - > - while ((char *) w < b + x - 2 * sizeof (S4)) > - { > - if (w->s10 && w->s8) > - { > - fn2 (w->s12, w->s10, &c); > - z--; > - z->s4 = c.s4; > - z->s13 = (unsigned short) ((char *) w - b); > - z->s14 = w->s9; > - a++; > - fn5 (); > - } > - > - w = fn3 (w); > - } > - return a; > -} > - > -__attribute__((regparm (3), noinline)) unsigned int > -test (void *u, S6 *v, S1 **w, S7 *x, S2 *y, S1 *z) > -{ > - unsigned b = v->s17->s16; > - unsigned a; > - S4 *c; > - unsigned d, e, f, i; > - > - fn1 (__func__, u, x->s18); > - c = (S4 *) (z->s3 + b); > - a = fn6 ((S3 *) (*w)->s3, b, y, c); > - c -= a; > - f = 0; > - e = 2; > - for (i = a - 1; ; i--) > - { > - if (f + (unsigned short) (c[i].s14 / 2) > b / 2) > - break; > - f += c[i].s14; > - e++; > - } > - d = a - e; > - return c[d].s4; > -} > +#include "a0pr36533.h" > > -int main (void) > -{ > - char *p = mmap (NULL, 131072, PROT_READ | PROT_WRITE, > - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); > - S1 wb, z, *w; > - S6 v; > - S7 x; > - S2 y; > - S5 vb; > - S4 s4; > - if (p == MAP_FAILED) > - return 0; > - if (munmap (p + 65536, 65536) < 0) > - return 0; > - memset (&wb, 0, sizeof (wb)); > - memset (&z, 0, sizeof (z)); > - memset (&v, 0, sizeof (v)); > - memset (&x, 0, sizeof (x)); > - memset (&y, 0, sizeof (y)); > - memset (&vb, 0, sizeof (vb)); > - memset (&s4, 0, sizeof (s4)); > - s4.s14 = 254; > - z.s3 = p + 65536 - 2 * sizeof (S4); > - w = &wb; > - v.s17 = &vb; > - vb.s16 = 2 * sizeof (S4); > - memcpy (z.s3, &s4, sizeof (s4)); > - memcpy (z.s3 + sizeof (s4), &s4, sizeof (s4)); > - test ((void *) 0, &v, &w, &x, &y, &z); > - return 0; > -} > #endif > Index: gcc/testsuite/g++.dg/pph/c2builtin2.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2builtin2.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2builtin2.cc (working copy) > @@ -1,3 +0,0 @@ > -#include "a2builtin4.h" > -#include "c2builtin5.h" > -#include "c2builtin6.h" > Index: gcc/testsuite/g++.dg/pph/c2builtin3.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2builtin3.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2builtin3.h (working copy) > @@ -1,6 +0,0 @@ > -#ifndef C2BUILTIN3_H > -#define C2BUILTIN3_H > -#include "c2builtin1.h" > -const char *refile = VALUE(__FILE__); > -const char *reline = VALUE(__LINE__); > -#endif > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn2c.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn2c.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn2c.hi (working copy) > @@ -1,11 +0,0 @@ > -template< typename T > > -dynarray<T>::dynarray(const dynarray& d) > -: store( alloc( d.count ) ), count( d.count ) > -{ > - try { > - std::uninitialized_copy( d.begin(), d.end(), begin() ); > - } > - catch ( ... ) { > - delete store; throw; > - } > -} > Index: gcc/testsuite/g++.dg/pph/c0altinc1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0altinc1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0altinc1.h (working copy) > @@ -1,4 +1,4 @@ > -#ifndef C1ALTINC1_H > -#define C1ALTINC1_H > +#ifndef C0ALTINC1_H > +#define C0ALTINC1_H > extern float f1; > #endif > Index: gcc/testsuite/g++.dg/pph/c0builtin5.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0builtin5.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0builtin5.h (working copy) > @@ -1,6 +1,6 @@ > -#ifndef C2BUILTIN5_H > -#define C2BUILTIN5_H > -#include "a2builtin4.h" > +#ifndef C0BUILTIN5_H > +#define C0BUILTIN5_H > +#include "a0builtin4.h" > const char *file = VALUE(__FILE__); > const char *line = VALUE(__LINE__); > const char *vers = VALUE(__cplusplus); > Index: gcc/testsuite/g++.dg/pph/x1dynarray1.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray1.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray1.cc (working copy) > @@ -1,15 +1,15 @@ > // { dg-do run } > // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } > > -#include "x1dynarray1.h" > +#include "x0dynarray1.h" > > typedef int integer; > typedef dynarray< integer > integer_array; > > int main() > { > - #include "a1dynarray-use1.cci" > - #include "a1dynarray-use2.cci" > - #include "a1dynarray-use4a.cci" > + #include "a0dynarray-use1.cci" > + #include "a0dynarray-use2.cci" > + #include "a0dynarray-use4a.cci" > return sum - 25; > } > Index: gcc/testsuite/g++.dg/pph/c1guarded3.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1guarded3.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1guarded3.h (working copy) > @@ -1,5 +1,5 @@ > #ifndef C1GUARDED3_H > #define C1GUARDED3_H > -#include "c1guarded1.h" > +#include "c0guarded1.h" > type variable3; > #endif > Index: gcc/testsuite/g++.dg/pph/c2dupguard2.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2dupguard2.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2dupguard2.h (working copy) > @@ -1,4 +0,0 @@ > -#ifndef C2DUPGUARD_H > -#define C2DUPGUARD_H > -extern int x; > -#endif > Index: gcc/testsuite/g++.dg/pph/x1dynarray5.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray5.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray5.h (working copy) > @@ -1,17 +0,0 @@ > -#ifndef X1DYNARRAY5_H > -#define X1DYNARRAY5_H > - > -#include "x1dynarray4.h" > - > -#include <new> > -#include <memory> > - > -namespace tst { > - > -#include "a1dynarray-dfn1b.hi" > -#include "a1dynarray-dfn2c.hi" > -#include "a1dynarray-dfn3b.hi" > - > -} // namespace tst > - > -#endif > Index: gcc/testsuite/g++.dg/pph/c2meteor-contest.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/c2meteor-contest.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c2meteor-contest.cc (working copy) > @@ -1,18 +0,0 @@ > -/* { dg-options "-w" } */ > - > -// pph asm xdiff > - > -#include "c2meteor-contest.h" > - > -int main(int argc, char **argv) { > - if(argc > 1) > - max_solutions = atoi(argv[1]); > - calc_pieces(); > - calc_rows(); > - solve(0, 0); > - printf("%d solutions found\n\n", solution_count); > - qsort(solutions, solution_count, 50 * sizeof(signed char), solution_sort); > - pretty(solutions[0]); > - pretty(solutions[solution_count-1]); > - return 0; > -} > Index: gcc/testsuite/g++.dg/pph/x5dynarray7.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x5dynarray7.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x5dynarray7.h (working copy) > @@ -3,8 +3,8 @@ > // { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } > // { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } > > -#ifndef X1DYNARRAY7_H > -#define X1DYNARRAY7_H > +#ifndef X5DYNARRAY7_H > +#define X5DYNARRAY7_H > > #include <stddef.h> > #include <new> > @@ -17,15 +17,15 @@ namespace tst { > template< typename T > > struct dynarray > { > - #include "a1dynarray-dcl1.hi" > - #include "a1dynarray-dcl2b.hi" > - #include "a1dynarray-dcl3.hi" > - #include "a1dynarray-dcl4.hi" > + #include "a0dynarray-dcl1.hi" > + #include "a0dynarray-dcl2b.hi" > + #include "a0dynarray-dcl3.hi" > + #include "a0dynarray-dcl4.hi" > }; > > -#include "a1dynarray-dfn1b.hi" > -#include "a1dynarray-dfn2c.hi" > -#include "a1dynarray-dfn3c.hi" > +#include "a0dynarray-dfn1b.hi" > +#include "a0dynarray-dfn2c.hi" > +#include "a0dynarray-dfn3c.hi" > > } // namespace tst > > Index: gcc/testsuite/g++.dg/pph/c0funcmac.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0funcmac.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0funcmac.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef C1FUNCMAC_H > -#define C1FUNCMAC_H > +#ifndef C0FUNCMAC_H > +#define C0FUNCMAC_H > #define gnu_dev_major(dev) long dev > #define gnu_dev_minor(dev) short dev > #define major(dev) gnu_dev_major (dev) > Index: gcc/testsuite/g++.dg/pph/c0-20060625-1.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c0-20060625-1.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/c0-20060625-1.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > +#ifndef C0_20060625_1_H > +#define C0_20060625_1_H > > /* PR middle-end/28151 */ > /* Testcase by Steven Bosscher <stevenb.gcc@gmail.com> */ > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dcl2b.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dcl2b.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dcl2b.hi (working copy) > @@ -1,3 +0,0 @@ > - // system-based types: > - typedef size_t size_type; > - typedef ptrdiff_t difference_type; > Index: gcc/testsuite/g++.dg/pph/x0struct0.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/x0struct0.h (revision 176055) > +++ gcc/testsuite/g++.dg/pph/x0struct0.h (working copy) > @@ -1,5 +1,5 @@ > -#ifndef X1STRUCT0_H > -#define X1STRUCT0_H > +#ifndef X0STRUCT0_H > +#define X0STRUCT0_H > typedef int type; > struct B { > }; > Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn3b.hi > =================================================================== > --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn3b.hi (revision 176187) > +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn3b.hi (working copy) > @@ -1,3 +0,0 @@ > -template< typename T > > -void dynarray<T>::check(size_type n) > -{ if ( n >= count ) throw n; } > Index: gcc/testsuite/g++.dg/pph/x1variables.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1variables.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1variables.cc (working copy) > @@ -1,5 +0,0 @@ > -#include "x1variables.h" > - > -int D::mbr_init_plain = 4; > -int D::mbr_uninit_plain; > -const int D::mbr_init_const = 5; > Index: gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.h (working copy) > @@ -1,189 +0,0 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > -/* { dg-options "-w" } */ > - > -#define WUR __attribute__((warn_unused_result)) > -#define WURAI __attribute__((warn_unused_result, always_inline)) inline > -typedef WUR int (*fnt) (void); > - > -typedef struct { long i; } A; > -typedef struct { long i; long j; } B; > -typedef struct { char big[1024]; fnt fn; } C; > - > -WUR int check1 (void); > -WUR void check2 (void); > -int foo WUR; > -int bar (void); > -extern WURAI int check3 (void) { return bar (); } > -WUR A check4 (void); > -WUR B check5 (void); > -WUR C check6 (void); > -A bar7 (void); > -B bar8 (void); > -C bar9 (void); > -extern WURAI A check7 (void) { return bar7 (); } > -extern WURAI B check8 (void) { return bar8 (); } > -extern WURAI C check9 (void) { return bar9 (); } > -/* This is useful for checking whether return value of statement > - expressions (returning int in this case) is used. */ > -extern WURAI int check_int_result (int res) { return res; } > -#define GU(v) ({ int e = 0; (v) = bar (); if ((v) < 23) e = 14; e; }) > -fnt fnptr; > -WUR int check10 (void); > -int baz (void); > -extern WURAI int check11 (void) { return baz (); } > -int k; > - > -void > -test (void) > -{ > - int i = 0, j; > - const fnt pcheck1 = check1; > - const fnt pcheck3 = check3; > - A a; > - B b; > - C c; > - if (check1 ()) > - return; > - i += check1 (); > - i += ({ check1 (); }); > - check1 (); > - (void) check1 (); > - check1 (), bar (); > - check2 (); > - (void) check2 (); > - check2 (), bar (); > - if (check3 ()) > - return; > - i += check3 (); > - i += ({ check3 (); }); > - check3 (); > - (void) check3 (); > - check3 (), bar (); > - a = check4 (); > - if (a.i) > - return; > - if (check4 ().i) > - return; > - if (({ check4 (); }).i) > - return; > - check4 (); > - (void) check4 (); > - check4 (), bar (); > - b = check5 (); > - if (b.i + b.j) > - return; > - if (check5 ().j) > - return; > - if (({ check5 (); }).j) > - return; > - check5 (); > - (void) check5 (); > - check5 (), bar (); > - c = check6 (); > - if (c.big[12] + c.big[29]) > - return; > - if (check6 ().big[27]) > - return; > - if (({ check6 (); }).big[0]) > - return; > - check6 (); > - (void) check6 (); > - check6 (), bar (); > - a = check7 (); > - if (a.i) > - return; > - if (check7 ().i) > - return; > - if (({ check7 (); }).i) > - return; > - check7 (); > - (void) check7 (); > - check7 (), bar (); > - b = check8 (); > - if (b.i + b.j) > - return; > - if (check8 ().j) > - return; > - if (({ check8 (); }).j) > - return; > - check8 (); > - (void) check8 (); > - check8 (), bar (); > - c = check9 (); > - if (c.big[12] + c.big[29]) > - return; > - if (check9 ().big[27]) > - return; > - if (({ check9 (); }).big[0]) > - return; > - check9 (); > - (void) check9 (); > - check9 (), bar (); > - if (check_int_result (GU (j))) > - return; > - i += check_int_result (GU (j)); > - i += ({ check_int_result (GU (j)); }); > - check_int_result (GU (j)); > - (void) check_int_result (GU (j)); > - check_int_result (GU (j)), bar (); > - if (fnptr ()) > - return; > - i += fnptr (); > - i += ({ fnptr (); }); > - fnptr (); > - (void) fnptr (); > - fnptr (), bar (); > - fnptr = check1; > - if (fnptr ()) > - return; > - i += fnptr (); > - i += ({ fnptr (); }); > - fnptr (); > - (void) fnptr (); > - fnptr (), bar (); > - fnptr = check3; > - if (fnptr ()) > - return; > - i += fnptr (); > - i += ({ fnptr (); }); > - fnptr (); > - (void) fnptr (); > - fnptr (), bar (); > - if (bar9 ().fn ()) > - return; > - i += bar9 ().fn (); > - i += ({ bar9 ().fn (); }); > - bar9 ().fn (); > - (void) bar9 ().fn (); > - bar9 ().fn (), bar (); > - if ((k ? check1 : check10) ()) > - return; > - i += (k ? check1 : check10) (); > - i += ({ (k ? check1 : check10) (); }); > - (k ? check1 : check10) (); > - (void) (k ? check1 : check10) (); > - (k ? check1 : check10) (), bar (); > - if ((k ? check3 : check11) ()) > - return; > - i += (k ? check3 : check11) (); > - i += ({ (k ? check3 : check11) (); }); > - (k ? check3 : check11) (); > - (void) (k ? check3 : check11) (); > - (k ? check3 : check11) (), bar (); > - if (pcheck1 ()) > - return; > - i += pcheck1 (); > - i += ({ pcheck1 (); }); > - pcheck1 (); > - (void) pcheck1 (); > - pcheck1 (), bar (); > - if (pcheck3 ()) > - return; > - i += pcheck3 (); > - i += ({ pcheck3 (); }); > - pcheck3 (); > - (void) pcheck3 (); > - pcheck3 (), bar (); > -} > -#endif > Index: gcc/testsuite/g++.dg/pph/c1pr44948-1a.h > =================================================================== > --- gcc/testsuite/g++.dg/pph/c1pr44948-1a.h (revision 176187) > +++ gcc/testsuite/g++.dg/pph/c1pr44948-1a.h (working copy) > @@ -1,18 +0,0 @@ > -#ifndef __PPH_GUARD_H > -#define __PPH_GUARD_H > -/* PR target/44948 */ > -/* { dg-options "-O -Wno-psabi -mtune=generic" } */ > - > -#pragma GCC target ("avx") > - > -struct A { long b[8] __attribute__((aligned (32))); }; > -void foo (long double, struct A); > - > -int > -main (void) > -{ > - struct A a = { { 0, 1, 2, 3, 4, 5, 6, 7 } }; > - foo (8.0L, a); > - return 0; > -} > -#endif > Index: gcc/testsuite/g++.dg/pph/x1dynarray2b.cc > =================================================================== > --- gcc/testsuite/g++.dg/pph/x1dynarray2b.cc (revision 176187) > +++ gcc/testsuite/g++.dg/pph/x1dynarray2b.cc (working copy) > @@ -1,14 +1,14 @@ > // { dg-do run } > > -#include "x1dynarray2.h" > +#include "x0dynarray2.h" > > typedef int integer; > typedef tst::dynarray< integer > integer_array; > > int main() > { > - #include "a1dynarray-use1.cci" > - #include "a1dynarray-use2.cci" > - #include "a1dynarray-use4a.cci" > + #include "a0dynarray-use1.cci" > + #include "a0dynarray-use2.cci" > + #include "a0dynarray-use4a.cci" > return sum - 25; > } > > -- > This patch is available for review at http://codereview.appspot.com/4678051 >

Index: gcc/testsuite/ChangeLog.pph 2011-07-11 Lawrence Crowl <crowl@google.com> * g++.dg/pph/README: Explain new naming scheme. * g++.dg/pph/c120060625-1.cc: Rename to c1-20060625-1.cc. * g++.dg/pph/c120060625-1.h: Rename to c0-20060625-1.h; edit deps. * g++.dg/pph/c1altinc.cc: Rename to c3altinc.cc. * g++.dg/pph/c1altinc1.h: Rename to c0altinc1.h; edit deps. * g++.dg/pph/c1altinc2.h: Rename to c3altinc2.h; edit deps. * g++.dg/pph/c1attr-warn-unused-result.cc: Rename to c1attr-warn-unused.cc. * g++.dg/pph/c1attr-warn-unused-result.h: Rename to c0attr-warn-unused.h; edit deps. * g++.dg/pph/x1autometh.h: Rename to x0autometh.h; edit deps. * g++.dg/pph/c1builtin-integral-1.cc: Rename to c1builtin-integral.cc. * g++.dg/pph/c1builtin-integral-1.h: Rename to c0builtin-integral.h; edit deps. * g++.dg/pph/c1builtin-object-size-2.cc: Rename to c1builtin-objsize.cc. * g++.dg/pph/c1builtin-object-size-2.h: Rename to c0builtin-objsize.h; edit deps. * g++.dg/pph/c2builtin1.cc: Rename to c3builtin1.cc. * g++.dg/pph/c2builtin1.h: Rename to c0builtin1.h; edit deps. * g++.dg/pph/c2builtin2.cc: Rename to c3builtin2.cc. * g++.dg/pph/c2builtin2.h: Rename to c1builtin2.h; edit deps. * g++.dg/pph/c2builtin3.h: Rename to c1builtin3.h; edit deps. * g++.dg/pph/a2builtin4.h: Rename to a0builtin4.h; edit deps. * g++.dg/pph/c2builtin5.h: Rename to c0builtin5.h; edit deps. * g++.dg/pph/c2builtin6.h: Rename to c0builtin6.h; edit deps. * g++.dg/pph/c1chained1.h: Rename to c0chained1.h; edit deps. * g++.dg/pph/c1chained2.h: Rename to c0chained2.h; edit deps. * g++.dg/pph/d2dupguard.cc: Rename to d8dupguard.cc. * g++.dg/pph/c2dupguard1.h: Rename to c0dupguard1.h; edit deps. * g++.dg/pph/c2dupguard2.h: Rename to c0dupguard2.h; edit deps. * g++.dg/pph/a1dynarray-dcl1.hi: Rename to a0dynarray-dcl1.hi; edit deps. * g++.dg/pph/a1dynarray-dcl2a.hi: Rename to a0dynarray-dcl2a.hi; edit deps. * g++.dg/pph/a1dynarray-dcl2b.hi: Rename to a0dynarray-dcl2b.hi; edit deps. * g++.dg/pph/a1dynarray-dcl3.hi: Rename to a0dynarray-dcl3.hi; edit deps. * g++.dg/pph/a1dynarray-dcl4.hi: Rename to a0dynarray-dcl4.hi; edit deps. * g++.dg/pph/a1dynarray-dfn1a.hi: Rename to a0dynarray-dfn1a.hi; edit deps. * g++.dg/pph/a1dynarray-dfn1b.hi: Rename to a0dynarray-dfn1b.hi; edit deps. * g++.dg/pph/a1dynarray-dfn2a.hi: Rename to a0dynarray-dfn2a.hi; edit deps. * g++.dg/pph/a1dynarray-dfn2b.hi: Rename to a0dynarray-dfn2b.hi; edit deps. * g++.dg/pph/a1dynarray-dfn2c.hi: Rename to a0dynarray-dfn2c.hi; edit deps. * g++.dg/pph/a1dynarray-dfn3a.hi: Rename to a0dynarray-dfn3a.hi; edit deps. * g++.dg/pph/a1dynarray-dfn3b.hi: Rename to a0dynarray-dfn3b.hi; edit deps. * g++.dg/pph/a1dynarray-dfn3c.hi: Rename to a0dynarray-dfn3c.hi; edit deps. * g++.dg/pph/a1dynarray-hlp1.cci: Rename to a0dynarray-hlp1.cci. * g++.dg/pph/a1dynarray-use1.cci: Rename to a0dynarray-use1.cci. * g++.dg/pph/a1dynarray-use2.cci: Rename to a0dynarray-use2.cci. * g++.dg/pph/a1dynarray-use3a.cci: Rename to a0dynarray-use3a.cci. * g++.dg/pph/a1dynarray-use3b.cci: Rename to a0dynarray-use3b.cci. * g++.dg/pph/a1dynarray-use4a.cci: Rename to a0dynarray-use4a.cci. * g++.dg/pph/a1dynarray-use4b.cci: Rename to a0dynarray-use4b.cci. * g++.dg/pph/x1dynarray1.h: Rename to x0dynarray1.h; edit deps. * g++.dg/pph/x1dynarray2.h: Rename to x0dynarray2.h; edit deps. * g++.dg/pph/x1dynarray3.cc: Rename to x6dynarray3.cc. * g++.dg/pph/x1dynarray3.h: Rename to x5dynarray3.h; edit deps. * g++.dg/pph/x1dynarray4.cc: Rename to x6dynarray4.cc. * g++.dg/pph/x1dynarray4.h: Rename to x0dynarray4.h; edit deps. * g++.dg/pph/x1dynarray5.cc: Rename to x7dynarray5.cc. * g++.dg/pph/x1dynarray5.h: Rename to x6dynarray5.h; edit deps. * g++.dg/pph/x1dynarray6.cc: Rename to x7dynarray6.cc. * g++.dg/pph/x1dynarray6.h: Rename to x6dynarray6.h; edit deps. * g++.dg/pph/x1dynarray7.cc: Rename to x7dynarray7.cc. * g++.dg/pph/x1dynarray7.h: Rename to x5dynarray7.h; edit deps. * g++.dg/pph/c1eabi1.h: Rename to c0eabi1.h; edit deps. * g++.dg/pph/c2eabi1.cc: Rename to c4eabi1.cc. * g++.dg/pph/c2eabi1.h: Rename to c4eabi1.h; edit deps. * g++.dg/pph/c1empty.h: Rename to c0empty.h; edit deps. * g++.dg/pph/c1field.h: Rename to c0field.h; edit deps. * g++.dg/pph/c1funcmac.h: Rename to c0funcmac.h; edit deps. * g++.dg/pph/c1funcstatic.h: Rename to c0funcstatic.h; edit deps. * g++.dg/pph/x1functions.cc: Rename to x2functions.cc. * g++.dg/pph/c1functions.h: Rename to c0functions.h; edit deps. * g++.dg/pph/x1globalref.h: Rename to x0globalref.h; edit deps. * g++.dg/pph/c1guarded.cc: Rename to c3guarded.cc. * g++.dg/pph/c1guarded1.h: Rename to c0guarded1.h; edit deps. * g++.dg/pph/x1hardlookup.h: Rename to x0hardlookup.h; edit deps. * g++.dg/pph/a1integer.h: Rename to a0integer.h; edit deps. * g++.dg/pph/c1limits-externalid.h: Rename to c0limits-externalid.h; edit deps. * g++.dg/pph/p1mean.cc: Rename to p4mean.cc. * g++.dg/pph/c2meteor-contest.cc: Rename to c4meteor-contest.cc. * g++.dg/pph/c1meteor-contest.h: Rename to c0meteor-contest.h; edit deps. * g++.dg/pph/c2meteor-contest.h: Rename to c4meteor-contest.h; edit deps. * g++.dg/pph/c1multinc.cc: Rename to c3multinc.cc. * g++.dg/pph/c1multinc1.h: Rename to c0multinc1.h; edit deps. * g++.dg/pph/c1multinc2.h: Rename to c3multinc2.h; edit deps. * g++.dg/pph/x1namespace.h: Rename to x0namespace.h; edit deps. * g++.dg/pph/x2nontrivinit.cc: Rename to x1nontrivinit.cc. * g++.dg/pph/x2nontrivinit.h: Rename to x0nontrivinit.h; edit deps. * g++.dg/pph/d2null.h: Rename to d0null.h; edit deps. * g++.dg/pph/y2overload.cc: Rename to y9overload.cc. * g++.dg/pph/x2overload1.h: Rename to x0overload1.h; edit deps. * g++.dg/pph/x2overload2.h: Rename to x0overload2.h; edit deps. * g++.dg/pph/x2overload3.h: Rename to x1overload3.h; edit deps. * g++.dg/pph/c2paste.cc: Rename to c1paste.cc. * g++.dg/pph/c2paste.h: Rename to c0paste.h; edit deps. * g++.dg/pph/a0pr36533.h: New. * g++.dg/pph/c1pr36533.cc: Rename to c2pr36533.cc. * g++.dg/pph/c4pr36533.cc: New. * g++.dg/pph/c4pr36533.h: New. * g++.dg/pph/c1pr44948-1a.h: Rename to c0pr44948-1a.h; edit deps. * g++.dg/pph/c1return-5.h: Rename to c0return-5.h; edit deps. * g++.dg/pph/c1simple.cc: Rename to c2simple.cc. * g++.dg/pph/c1simple1.h: Rename to c0simple1.h; edit deps. * g++.dg/pph/y2smother.cc: Rename to y8inc-nmspc.cc. * g++.dg/pph/x1special.h: Rename to x0special.h; edit deps. * g++.dg/pph/c1struct.h: Rename to c0struct.h; edit deps. * g++.dg/pph/x1struct0.h: Rename to x0struct0.h; edit deps. * g++.dg/pph/x1struct1.cc: Rename to x2struct1.cc. * g++.dg/pph/x1struct2.cc: Rename to x2struct2.cc. * g++.dg/pph/d1symnotinc.h: Rename to d0symnotinc.h; edit deps. * g++.dg/pph/x1template.h: Rename to x0template.h; edit deps. * g++.dg/pph/x1ten-hellos.h: Rename to x0ten-hellos.h; edit deps. * g++.dg/pph/x1tmplclass.h: Rename to x0tmplclass.h; edit deps. * g++.dg/pph/x1tmplfunc.h: Rename to x0tmplfunc.h; edit deps. * g++.dg/pph/x1typerefs.cc: Rename to x2typerefs.cc. * g++.dg/pph/c1typerefs.h: Rename to c0typerefs.h; edit deps. * g++.dg/pph/d1unguarded.h: Rename to d0unguarded.h; edit deps. * g++.dg/pph/x1variables.cc: Rename to x2variables.cc. * g++.dg/pph/c1variables.h: Rename to c0variables.h; edit deps. * g++.dg/pph/c1varorder.h: Rename to c0varorder.h; edit deps. Index: gcc/testsuite/g++.dg/pph/x2nontrivinit.h =================================================================== --- gcc/testsuite/g++.dg/pph/x2nontrivinit.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x2nontrivinit.h (working copy) @@ -1,5 +0,0 @@ -#ifndef X2NONTRIVINIT_H -#define X2NONTRIVINIT_H -int y = 0; -int x = y+1; -#endif Index: gcc/testsuite/g++.dg/pph/c0chained1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0chained1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0chained1.h (working copy) @@ -1,4 +1,4 @@ -#ifndef C1CHAINED1_H -#define C1CHAINED1_H +#ifndef C0CHAINED1_H +#define C0CHAINED1_H #define ONE 1 #endif Index: gcc/testsuite/g++.dg/pph/c0field.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0field.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0field.h (working copy) @@ -1,5 +1,5 @@ -#ifndef C1FIELD_H -#define C1FIELD_H +#ifndef C0FIELD_H +#define C0FIELD_H typedef int language; struct program { language field; Index: gcc/testsuite/g++.dg/pph/c1varorder.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1varorder.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1varorder.h (working copy) @@ -1,7 +0,0 @@ -#ifndef __C1VARORDER_H -#define __C1VARORDER_H - -int var1; -int var2; - -#endif Index: gcc/testsuite/g++.dg/pph/x1struct2.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1struct2.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1struct2.cc (working copy) @@ -1,10 +0,0 @@ -#include "x1struct2.h" - -type D::method() -{ static int x = 2; - return fld + mbr + gbl; } - -type D::mbr = 4; -typedef D D2; -D2 var1; -D2 var2 = var1; Index: gcc/testsuite/g++.dg/pph/c0guarded1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0guarded1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0guarded1.h (working copy) @@ -1,4 +1,4 @@ -#ifndef C1GUARDED1_H -#define C1GUARDED1_H +#ifndef C0GUARDED1_H +#define C0GUARDED1_H typedef int type; #endif Index: gcc/testsuite/g++.dg/pph/c0builtin6.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0builtin6.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0builtin6.h (working copy) @@ -1,6 +1,6 @@ -#ifndef C2BUILTIN6_H -#define C2BUILTIN6_H -#include "a2builtin4.h" +#ifndef C0BUILTIN6_H +#define C0BUILTIN6_H +#include "a0builtin4.h" const char *refile = VALUE(__FILE__); const char *reline = VALUE(__LINE__); #endif Index: gcc/testsuite/g++.dg/pph/x1functions.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1functions.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1functions.h (working copy) @@ -1,6 +1,6 @@ #ifndef X1FUNCTIONS_H #define X1FUNCTIONS_H -#include "c1functions.h" +#include "c0functions.h" inline int extern_inline(int i) // lazy body { return extern_then_body(i); } struct type { Index: gcc/testsuite/g++.dg/pph/x1dynarray7.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray7.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray7.cc (working copy) @@ -1,28 +0,0 @@ -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } -// { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } - -#include <algorithm> -#include <iostream> - -#include "x1dynarray7.h" - -#include "a1integer.h" -typedef tst::dynarray< integer > integer_array; - -#include "a1dynarray-hlp1.cci" - -int main() -{ - #include "a1dynarray-use1.cci" - dump( source ); - dump( sorted ); - std::sort( sorted.begin(), sorted.end() ); - dump( sorted ); - #include "a1dynarray-use2.cci" - dump( target ); - #include "a1dynarray-use3b.cci" - #include "a1dynarray-use4b.cci" - return sum - 23; -} Index: gcc/testsuite/g++.dg/pph/x6dynarray3.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x6dynarray3.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/x6dynarray3.cc (working copy) @@ -1,15 +1,15 @@ // { dg-do run } -#include "x1dynarray3.h" +#include "x5dynarray3.h" -#include "a1integer.h" +#include "a0integer.h" typedef tst::dynarray< integer > integer_array; int main() { - #include "a1dynarray-use1.cci" - #include "a1dynarray-use2.cci" - #include "a1dynarray-use3a.cci" - #include "a1dynarray-use4a.cci" + #include "a0dynarray-use1.cci" + #include "a0dynarray-use2.cci" + #include "a0dynarray-use3a.cci" + #include "a0dynarray-use4a.cci" return sum - 25; } Index: gcc/testsuite/g++.dg/pph/x1dynarray6.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray6.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray6.h (working copy) @@ -1,23 +0,0 @@ -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } -// { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } - -#ifndef X1DYNARRAY6_H -#define X1DYNARRAY6_H - -#include "x1dynarray4.h" - -#include <new> -#include <memory> -#include <stdexcept> - -namespace tst { - -#include "a1dynarray-dfn1b.hi" -#include "a1dynarray-dfn2c.hi" -#include "a1dynarray-dfn3c.hi" - -} // namespace tst - -#endif Index: gcc/testsuite/g++.dg/pph/y2smother.cc =================================================================== --- gcc/testsuite/g++.dg/pph/y2smother.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/y2smother.cc (working copy) @@ -1,4 +0,0 @@ -namespace smother { -#include "x1struct1.h" -// { dg-error "pph file not included at global scope" "" { xfail *-*-* } } -} Index: gcc/testsuite/g++.dg/pph/c4meteor-contest.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c4meteor-contest.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/c4meteor-contest.cc (working copy) @@ -1,7 +1,7 @@ -/* { dg-timeout 2 { target *-*-* } } */ -// { dg-xfail-if "INFINITE" { "*-*-*" } { "-fpph-map=pph.map" } } /* { dg-options "-w" } */ -#include "c2meteor-contest.h" +// pph asm xdiff + +#include "c4meteor-contest.h" int main(int argc, char **argv) { if(argc > 1) Index: gcc/testsuite/g++.dg/pph/x1autometh.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1autometh.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1autometh.cc (working copy) @@ -1,4 +1,4 @@ -#include "x1autometh.h" +#include "x0autometh.h" void function() { base var1; Index: gcc/testsuite/g++.dg/pph/c0simple1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0simple1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0simple1.h (working copy) @@ -1,5 +1,5 @@ -#ifndef C1SIMPLE1_H -#define C1SIMPLE1_H +#ifndef C0SIMPLE1_H +#define C0SIMPLE1_H #define assert(x) yellow(x) extern void yellow(int); Index: gcc/testsuite/g++.dg/pph/x1tmplfunc.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1tmplfunc.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1tmplfunc.cc (working copy) @@ -1,4 +1,4 @@ -#include "x1tmplfunc.h" +#include "x0tmplfunc.h" type val = 3; Index: gcc/testsuite/g++.dg/pph/a1dynarray-use3a.cci =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-use3a.cci (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-use3a.cci (working copy) @@ -1,8 +0,0 @@ - try { - integer t = target.at(32); - } - catch ( integer_array::size_type ) { - } - catch ( ... ) { - return 1; - } Index: gcc/testsuite/g++.dg/pph/x0tmplfunc.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0tmplfunc.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0tmplfunc.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1TMPLFUNC_H -#define X1TMPLFUNC_H +#ifndef X0TMPLFUNC_H +#define X0TMPLFUNC_H typedef int type; extern type val; Index: gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.cc (working copy) @@ -1,2 +0,0 @@ -/* { dg-options "-O2 -w -fpermissive" } */ -#include "c1builtin-object-size-2.h" Index: gcc/testsuite/g++.dg/pph/c0attr-warn-unused.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0attr-warn-unused.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0attr-warn-unused.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H +#ifndef C0ATTR_WARN_UNUSED_H +#define C0ATTR_WARN_UNUSED_H /* { dg-options "-w" } */ #define WUR __attribute__((warn_unused_result)) Index: gcc/testsuite/g++.dg/pph/c1return-5.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1return-5.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1return-5.h (working copy) @@ -1,16 +0,0 @@ -// { dg-options "-mpreferred-stack-boundary=4" } - -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H - -/* This compile only test is to detect an assertion failure in stack branch - development. */ -struct bar -{ - int x; -} __attribute__((aligned(64))); - - -struct bar -foo (void) { } -#endif Index: gcc/testsuite/g++.dg/pph/x2overload1.h =================================================================== --- gcc/testsuite/g++.dg/pph/x2overload1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x2overload1.h (working copy) @@ -1,4 +0,0 @@ -#ifndef X2OVERLOAD1_H -#define X2OVERLOAD1_H -int o(double x); -#endif Index: gcc/testsuite/g++.dg/pph/a0pr36533.h =================================================================== --- gcc/testsuite/g++.dg/pph/a0pr36533.h (revision 0) +++ gcc/testsuite/g++.dg/pph/a0pr36533.h (revision 0) @@ -0,0 +1,165 @@ +typedef struct S1 +{ + unsigned long s1; + struct S1 *s2; + char *s3; +} S1; + +typedef struct +{ + unsigned int s4; + unsigned int s5; + int s6; + unsigned int *s7; +} S2; + +typedef struct +{ + unsigned int s8; + unsigned short s9; + unsigned char s10; + unsigned char s11; + char s12[255]; +} S3; + +typedef struct +{ + unsigned int s4; + unsigned short s13; + unsigned short s14; +} S4; + +typedef struct +{ + char s15[16]; + unsigned long s16; +} S5; + +typedef struct +{ + char s15[48]; + S5 *s17; +} S6; + +typedef struct +{ + S1 *s18; +} S7; + +__attribute__((regparm (3), noinline)) int +fn1 (const char *x, void *y, S1 *z) +{ + asm volatile ("" : : : "memory"); + return *x + (y != 0); +} + +__attribute__((regparm (3), noinline)) int +fn2 (const char *x, int y, S2 *z) +{ + asm volatile ("" : : : "memory"); + return 0; +} + +static inline __attribute__ ((always_inline)) unsigned int +fn4 (unsigned short x) +{ + unsigned len = x; + if (len == ((1 << 16) - 1)) + return 1 << 16; + return len; +} + +static inline __attribute__ ((always_inline)) S3 * +fn3 (S3 *p) +{ + return (S3 *) ((char *) p + fn4 (p->s9)); +} + +__attribute__((regparm (3), noinline)) int +fn5 (void) +{ + asm volatile ("" : : : "memory"); + return 0; +} + +static inline __attribute__ ((always_inline)) int +fn6 (S3 *w, int x, S2 *y, S4 *z) +{ + int a = 2; + char *b = (char *) w; + S2 c = *y; + + while ((char *) w < b + x - 2 * sizeof (S4)) + { + if (w->s10 && w->s8) + { + fn2 (w->s12, w->s10, &c); + z--; + z->s4 = c.s4; + z->s13 = (unsigned short) ((char *) w - b); + z->s14 = w->s9; + a++; + fn5 (); + } + + w = fn3 (w); + } + return a; +} + +__attribute__((regparm (3), noinline)) unsigned int +test (void *u, S6 *v, S1 **w, S7 *x, S2 *y, S1 *z) +{ + unsigned b = v->s17->s16; + unsigned a; + S4 *c; + unsigned d, e, f, i; + + fn1 (__func__, u, x->s18); + c = (S4 *) (z->s3 + b); + a = fn6 ((S3 *) (*w)->s3, b, y, c); + c -= a; + f = 0; + e = 2; + for (i = a - 1; ; i--) + { + if (f + (unsigned short) (c[i].s14 / 2) > b / 2) + break; + f += c[i].s14; + e++; + } + d = a - e; + return c[d].s4; +} + +int main (void) +{ + char *p = mmap (NULL, 131072, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + S1 wb, z, *w; + S6 v; + S7 x; + S2 y; + S5 vb; + S4 s4; + if (p == MAP_FAILED) + return 0; + if (munmap (p + 65536, 65536) < 0) + return 0; + memset (&wb, 0, sizeof (wb)); + memset (&z, 0, sizeof (z)); + memset (&v, 0, sizeof (v)); + memset (&x, 0, sizeof (x)); + memset (&y, 0, sizeof (y)); + memset (&vb, 0, sizeof (vb)); + memset (&s4, 0, sizeof (s4)); + s4.s14 = 254; + z.s3 = p + 65536 - 2 * sizeof (S4); + w = &wb; + v.s17 = &vb; + vb.s16 = 2 * sizeof (S4); + memcpy (z.s3, &s4, sizeof (s4)); + memcpy (z.s3 + sizeof (s4), &s4, sizeof (s4)); + test ((void *) 0, &v, &w, &x, &y, &z); + return 0; +} Index: gcc/testsuite/g++.dg/pph/d0symnotinc.h =================================================================== --- gcc/testsuite/g++.dg/pph/d0symnotinc.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/d0symnotinc.h (working copy) @@ -1,5 +1,5 @@ -#ifndef D1SDYMNOTINC_H -#define D1SDYMNOTINC_H +#ifndef D0SDYMNOTINC_H +#define D0SDYMNOTINC_H struct T { int f; }; struct T NAME = { VALUE }; // { dg-error "was not declared in this scope" } #endif Index: gcc/testsuite/g++.dg/pph/c4eabi1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c4eabi1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c4eabi1.h (working copy) @@ -2,8 +2,8 @@ // FIXME pph - Enabling PPH for this file causes memory problems in cc1plus. // c1eabi1.h c1eabi1.pph -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H +#ifndef C4EABI1_H +#define C4EABI1_H /* This file tests most of the non-C++ run-time helper functions described in Section 4 of the "Run-Time ABI for the ARM Index: gcc/testsuite/g++.dg/pph/x1template.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1template.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1template.h (working copy) @@ -1,20 +0,0 @@ -#ifndef X1TEMPLATE_H -#define X1TEMPLATE_H -extern int x; -struct B; -template< typename T > -struct C { - T* b; - int method(); - int another() - { return *b; } -}; -template< typename T > -int C< T >::method() -{ return x; } -struct D : C< int > { - int method(); - int another() - { return *b; } -}; -#endif Index: gcc/testsuite/g++.dg/pph/x0dynarray4.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0dynarray4.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0dynarray4.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1DYNARRAY4_H -#define X1DYNARRAY4_H +#ifndef X0DYNARRAY4_H +#define X0DYNARRAY4_H #include <stddef.h> @@ -8,9 +8,9 @@ namespace tst { template< typename T > struct dynarray { - #include "a1dynarray-dcl1.hi" - #include "a1dynarray-dcl2b.hi" - #include "a1dynarray-dcl3.hi" + #include "a0dynarray-dcl1.hi" + #include "a0dynarray-dcl2b.hi" + #include "a0dynarray-dcl3.hi" }; } // namespace tst Index: gcc/testsuite/g++.dg/pph/c0variables.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0variables.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0variables.h (working copy) @@ -1,5 +1,5 @@ -#ifndef C1VARIABLES_H -#define C1VARIABLES_H +#ifndef C0VARIABLES_H +#define C0VARIABLES_H extern int gbl_init_extern; extern int gbl_uninit_extern; int gbl_tentative; Index: gcc/testsuite/g++.dg/pph/x2nontrivinit.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x2nontrivinit.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x2nontrivinit.cc (working copy) @@ -1 +0,0 @@ -#include "x2nontrivinit.h" Index: gcc/testsuite/g++.dg/pph/c0builtin-integral.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0builtin-integral.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0builtin-integral.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H +#ifndef C0BUILTIN_INTEGRAL_H +#define C0BUILTIN_INTEGRAL_H /* Copyright (C) 2004 Free Software Foundation. Verify that integral FP expressions are optimized. Index: gcc/testsuite/g++.dg/pph/c0chained2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0chained2.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0chained2.h (working copy) @@ -1,4 +1,4 @@ -#ifndef C1CHAINED2_H -#define C1CHAINED2_H +#ifndef C0CHAINED2_H +#define C0CHAINED2_H #define TWO ONE #endif Index: gcc/testsuite/g++.dg/pph/d1unguarded.h =================================================================== --- gcc/testsuite/g++.dg/pph/d1unguarded.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/d1unguarded.h (working copy) @@ -1 +0,0 @@ -extern int x; // { dg-error "header lacks guard for PPH" } Index: gcc/testsuite/g++.dg/pph/x0globalref.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0globalref.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0globalref.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1GLOBALREF_H -#define X1GLOBALREF_H +#ifndef X0GLOBALREF_H +#define X0GLOBALREF_H typedef int type; const type n = 3; const type m = 4; Index: gcc/testsuite/g++.dg/pph/c1builtin2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1builtin2.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c1builtin2.h (working copy) @@ -1,6 +1,6 @@ -#ifndef C2BUILTIN2_H -#define C2BUILTIN2_H -#include "c2builtin1.h" +#ifndef C1BUILTIN2_H +#define C1BUILTIN2_H +#include "c0builtin1.h" const char *file = VALUE(__FILE__); const char *line = VALUE(__LINE__); const char *vers = VALUE(__cplusplus); Index: gcc/testsuite/g++.dg/pph/a0integer.h =================================================================== --- gcc/testsuite/g++.dg/pph/a0integer.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/a0integer.h (working copy) @@ -1,5 +1,5 @@ -#ifndef A1INTEGER_H -#define A1INTEGER_H +#ifndef A0INTEGER_H +#define A0INTEGER_H class integer { Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn3c.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn3c.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn3c.hi (working copy) @@ -1,3 +0,0 @@ -template< typename T > -void dynarray<T>::check(size_type n) -{ if ( n >= count ) throw std::out_of_range("dynarray"); } Index: gcc/testsuite/g++.dg/pph/c2builtin5.h =================================================================== --- gcc/testsuite/g++.dg/pph/c2builtin5.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2builtin5.h (working copy) @@ -1,9 +0,0 @@ -#ifndef C2BUILTIN5_H -#define C2BUILTIN5_H -#include "a2builtin4.h" -const char *file = VALUE(__FILE__); -const char *line = VALUE(__LINE__); -const char *vers = VALUE(__cplusplus); -const char *optm = VALUE(__OPTIMIZE__); -const char *func() { return __func__; } -#endif Index: gcc/testsuite/g++.dg/pph/x0special.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0special.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0special.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1SPECIAL_H -#define X1SPECIAL_H +#ifndef X0SPECIAL_H +#define X0SPECIAL_H struct B { B( int ); Index: gcc/testsuite/g++.dg/pph/x1dynarray7.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray7.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray7.h (working copy) @@ -1,32 +0,0 @@ -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } -// { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } - -#ifndef X1DYNARRAY7_H -#define X1DYNARRAY7_H - -#include <stddef.h> -#include <new> -#include <memory> -#include <stdexcept> -#include <iterator> - -namespace tst { - -template< typename T > -struct dynarray -{ - #include "a1dynarray-dcl1.hi" - #include "a1dynarray-dcl2b.hi" - #include "a1dynarray-dcl3.hi" - #include "a1dynarray-dcl4.hi" -}; - -#include "a1dynarray-dfn1b.hi" -#include "a1dynarray-dfn2c.hi" -#include "a1dynarray-dfn3c.hi" - -} // namespace tst - -#endif Index: gcc/testsuite/g++.dg/pph/x7dynarray5.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x7dynarray5.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/x7dynarray5.cc (working copy) @@ -3,27 +3,27 @@ // { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } // { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } -#include "x1dynarray4.h" -#include "x1dynarray5.h" +#include "x0dynarray4.h" +#include "x6dynarray5.h" #include <algorithm> #include <iostream> -#include "a1integer.h" +#include "a0integer.h" typedef tst::dynarray< integer > integer_array; -#include "a1dynarray-hlp1.cci" +#include "a0dynarray-hlp1.cci" int main() { - #include "a1dynarray-use1.cci" + #include "a0dynarray-use1.cci" dump( source ); dump( sorted ); std::sort( sorted.begin(), sorted.end() ); dump( sorted ); - #include "a1dynarray-use2.cci" + #include "a0dynarray-use2.cci" dump( target ); - #include "a1dynarray-use3a.cci" - #include "a1dynarray-use4a.cci" + #include "a0dynarray-use3a.cci" + #include "a0dynarray-use4a.cci" return sum - 23; } Index: gcc/testsuite/g++.dg/pph/x0autometh.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0autometh.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0autometh.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1AUTOMETH_H -#define X1AUTOMETH_H +#ifndef X0AUTOMETH_H +#define X0AUTOMETH_H class base { virtual int method() { return 0; Index: gcc/testsuite/g++.dg/pph/c1paste.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1paste.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/c1paste.cc (working copy) @@ -1,4 +1,4 @@ -#include "c2paste.h" +#include "c0paste.h" void foo_30_(int); void bar(void) { Index: gcc/testsuite/g++.dg/pph/d2null.h =================================================================== --- gcc/testsuite/g++.dg/pph/d2null.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/d2null.h (working copy) @@ -1 +0,0 @@ -// { dg-error "header lacks guard for PPH" } Index: gcc/testsuite/g++.dg/pph/x1namespace.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1namespace.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1namespace.cc (working copy) @@ -1,4 +1,4 @@ -#include "x1namespace.h" +#include "x0namespace.h" namespace A { int x = 3; Index: gcc/testsuite/g++.dg/pph/c1field.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1field.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1field.cc (working copy) @@ -1,4 +1,4 @@ -#include "c1field.h" +#include "c0field.h" struct client { program field; }; Index: gcc/testsuite/g++.dg/pph/c2eabi1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c2eabi1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2eabi1.h (working copy) @@ -1,161 +0,0 @@ -// { dg-options "-w -fpermissive" } -// FIXME pph - Enabling PPH for this file causes memory problems in cc1plus. -// c1eabi1.h c1eabi1.pph - -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H - -/* This file tests most of the non-C++ run-time helper functions - described in Section 4 of the "Run-Time ABI for the ARM - Architecture". These are basic tests; they do not try to validate - all of the corner cases in these routines. - - The functions not tested here are: - - __aeabi_cdcmpeq - __aeabi_cdcmple - __aeabi_cdrcmple - __aeabi_cfcmpeq - __aeabi_cfcmple - __aeabi_cfrcmple - __aeabi_ldivmod - __aeabi_uldivmod - __aeabi_idivmod - __aeabi_uidivmod - - These functions have non-standard calling conventions that would - require the use of inline assembly to test. It would be good to - add such tests, but they have not yet been implemented. - - There are also no tests for the "division by zero", "memory copying, - clearing, and setting" functions. */ - -#include <stdio.h> -#include <stdlib.h> -#include <math.h> - -/* All these functions are defined to use the base ABI, so use the - attribute to ensure the tests use the base ABI to call them even - when the VFP ABI is otherwise in effect. */ -#define PCS __attribute__((pcs("aapcs"))) - -#define decl_float(code, type) \ - extern type __aeabi_ ## code ## add (type, type) PCS; \ - extern type __aeabi_ ## code ## div (type, type) PCS; \ - extern type __aeabi_ ## code ## mul (type, type) PCS; \ - extern type __aeabi_ ## code ## neg (type) PCS; \ - extern type __aeabi_ ## code ## rsub (type, type) PCS; \ - extern type __aeabi_ ## code ## sub (type, type) PCS; \ - extern int __aeabi_ ## code ## cmpeq (type, type) PCS; \ - extern int __aeabi_ ## code ## cmplt (type, type) PCS; \ - extern int __aeabi_ ## code ## cmple (type, type) PCS; \ - extern int __aeabi_ ## code ## cmpge (type, type) PCS; \ - extern int __aeabi_ ## code ## cmpgt (type, type) PCS; \ - extern int __aeabi_ ## code ## cmpun (type, type) PCS; \ - extern int __aeabi_ ## code ## 2iz (type) PCS; \ - extern unsigned int __aeabi_ ## code ## 2uiz (type) PCS; \ - extern long long __aeabi_ ## code ## 2lz (type) PCS; \ - extern unsigned long long __aeabi_ ## code ## 2ulz (type) PCS; \ - extern type __aeabi_i2 ## code (int) PCS; \ - extern type __aeabi_ui2 ## code (int) PCS; \ - extern type __aeabi_l2 ## code (long long) PCS; \ - extern type __aeabi_ul2 ## code (unsigned long long) PCS; \ - \ - type code ## zero = 0.0; \ - type code ## one = 1.0; \ - type code ## two = 2.0; \ - type code ## four = 4.0; \ - type code ## minus_one = -1.0; \ - type code ## minus_two = -2.0; \ - type code ## minus_four = -4.0; \ - type code ## epsilon = 1E-32; \ - type code ## NaN = 0.0 / 0.0; - -decl_float (d, double) -decl_float (f, float) - -extern float __aeabi_d2f (double) PCS; -extern double __aeabi_f2d (float) PCS; -extern long long __aeabi_lmul (long long, long long); -extern long long __aeabi_llsl (long long, int); -extern long long __aeabi_llsr (long long, int); -extern long long __aeabi_lasr (long long, int); -extern int __aeabi_lcmp (long long, long long); -extern int __aeabi_ulcmp (unsigned long long, unsigned long long); -extern int __aeabi_idiv (int, int); -extern unsigned int __aeabi_uidiv (unsigned int, unsigned int); -extern int __aeabi_uread4 (void *); -extern int __aeabi_uwrite4 (int, void *); -extern long long __aeabi_uread8 (void *); -extern long long __aeabi_uwrite8 (long long, void *); - -#define eq(a, b, type, abs, epsilon, format) \ - { \ - type a1; \ - type b1; \ - \ - a1 = a; \ - b1 = b; \ - if (abs (a1 - b1) > epsilon) \ - { \ - fprintf (stderr, "%d: Test %s == %s\n", __LINE__, #a, #b); \ - fprintf (stderr, "%d: " format " != " format "\n", \ - __LINE__, a1, b1); \ - abort (); \ - } \ - } - -#define ieq(a, b) eq (a, b, int, abs, 0, "%d") -#define ueq(a, b) eq (a, b, unsigned int, abs, 0, "%u") -#define leq(a, b) eq (a, b, long long, abs, 0, "%lld") -#define uleq(a, b) eq (a, b, unsigned long long, abs, 0, "%llu") -#define feq(a, b) eq (a, b, float, fabs, fepsilon, "%f") -#define deq(a, b) eq (a, b, double, fabs, depsilon, "%g") - -#define NUM_CMP_VALUES 6 - -/* Values picked to cover a range of small, large, positive and negative. */ -static unsigned int cmp_val[NUM_CMP_VALUES] = -{ - 0, - 1, - 0x40000000, - 0x80000000, - 0xc0000000, - 0xffffffff -}; - -/* All combinations for each of the above values. */ -#define ulcmp(l, s, m) \ - s, l, l, l, l, l, m, s, l, l, l, l, \ - m, m, s, l, l, l, m, m, m, s, l, l, \ - m, m, m, m, s, l, m, m, m, m, m, s - -#define lcmp(l, s, m) \ - s, l, l, m, m, m, m, s, l, m, m, m, \ - m, m, s, m, m, m, l, l, l, s, l, l, \ - l, l, l, m, s, l, l, l, l, m, m, s - -/* All combinations of the above for high/low words. */ -static int lcmp_results[] = -{ - lcmp(ulcmp(-1, -1, -1), ulcmp(-1, 0, 1), ulcmp(1, 1, 1)) -}; - -static int ulcmp_results[] = -{ - ulcmp(ulcmp(-1, -1, -1), ulcmp(-1, 0, 1), ulcmp(1, 1, 1)) -}; - -static int signof(int i) -{ - if (i < 0) - return -1; - - if (i == 0) - return 0; - - return 1; -} - -#endif Index: gcc/testsuite/g++.dg/pph/c0struct.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0struct.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0struct.h (working copy) @@ -1,5 +1,5 @@ -#ifndef C1STRUCT_H -#define C1STRUCT_H +#ifndef C0STRUCT_H +#define C0STRUCT_H typedef int type; type gbl = 1; struct B { Index: gcc/testsuite/g++.dg/pph/x2overload2.h =================================================================== --- gcc/testsuite/g++.dg/pph/x2overload2.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x2overload2.h (working copy) @@ -1,4 +0,0 @@ -#ifndef X2OVERLOAD2_H -#define X2OVERLOAD2_H -int o(float x); -#endif Index: gcc/testsuite/g++.dg/pph/README =================================================================== --- gcc/testsuite/g++.dg/pph/README (revision 176187) +++ gcc/testsuite/g++.dg/pph/README (working copy) @@ -1,7 +1,8 @@ The test names have the following convention on the prefix of their names. - [acdpxy][12]* + [acdpxy][0-9]* + a - auxillary headers c - positive tests for c-level headers and sources d - negative tests for c-level headers and sources @@ -10,8 +11,22 @@ names. tests. x - C++-level positive tests. y - C++-level negative tests. - 1 - first priority feature tests - 2 - second priority feature tests + + 0 - tests with no pph inclusions (usually headers) + 1 - tests with a single leading pph file + 2 - tests with a nested leading pph files + 3 - tests non-leading pph files, but at most simple merging + 4 - tests non-leading pph files, with significant merging + + 5 - tests with no pph inclusions plus C++stdlib merging + 6 - tests with nested leading plus C++stdlib merging + 7 - tests non-leading pph files plus C++stdlib merging + + 8 - tests for secondary diagnostic features we would like to have + 9 - tests for tertiary diagnostic features we probably do not want These prefixes are in lexical order with respect to the compilations. That is, you must pick names in the right place in the build. + +Tests labeled [567] are heavy iff the C++ standard library has been +built with PPH. Index: gcc/testsuite/g++.dg/pph/x1tmplclass.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1tmplclass.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1tmplclass.cc (working copy) @@ -1,7 +1,7 @@ // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } -// { dg-bogus "x1tmplclass.h:14:5: error: specializing member .wrapper<char>::cache. requires .template<>. syntax" "" { xfail *-*-* } 0 } +// { dg-bogus "x0tmplclass.h:14:5: error: specializing member .wrapper<char>::cache. requires .template<>. syntax" "" { xfail *-*-* } 0 } -#include "x1tmplclass.h" +#include "x0tmplclass.h" int wrapper<char>::cache = 2; Index: gcc/testsuite/g++.dg/pph/x1tmplclass.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1tmplclass.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1tmplclass.h (working copy) @@ -1,17 +0,0 @@ -#ifndef X1TMPLCLASS_H -#define X1TMPLCLASS_H -template< typename T > -struct wrapper { - T value; - static T cache; -}; - -template< typename T > -T wrapper<T>::cache = 3; - -template<> -struct wrapper<char> { - int value; - static int cache; -}; -#endif Index: gcc/testsuite/g++.dg/pph/c0pr44948-1a.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0pr44948-1a.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0pr44948-1a.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H +#ifndef C0PR44948_1A_H +#define C0PR44948_1A_H /* PR target/44948 */ /* { dg-options "-O -Wno-psabi -mtune=generic" } */ Index: gcc/testsuite/g++.dg/pph/c0typerefs.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0typerefs.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0typerefs.h (working copy) @@ -1,5 +1,5 @@ -#ifndef C1TYPEREFS_H -#define C1TYPEREFS_H +#ifndef C0TYPEREFS_H +#define C0TYPEREFS_H struct base { int field; }; Index: gcc/testsuite/g++.dg/pph/x6dynarray4.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x6dynarray4.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/x6dynarray4.cc (working copy) @@ -1,19 +1,19 @@ // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } // { dg-bogus "cstdlib:42:0: error: PPH file stdlib.pph fails macro validation, __STDDEF_H__" "" { xfail *-*-* } 0 } -#include "x1dynarray5.h" +#include "x6dynarray5.h" #include <algorithm> -#include "a1integer.h" +#include "a0integer.h" typedef tst::dynarray< integer > integer_array; int main() { - #include "a1dynarray-use1.cci" + #include "a0dynarray-use1.cci" std::sort( sorted.begin(), sorted.end() ); - #include "a1dynarray-use2.cci" - #include "a1dynarray-use3a.cci" - #include "a1dynarray-use4a.cci" + #include "a0dynarray-use2.cci" + #include "a0dynarray-use3a.cci" + #include "a0dynarray-use4a.cci" return sum - 23; } Index: gcc/testsuite/g++.dg/pph/x1nontrivinit.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1nontrivinit.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/x1nontrivinit.cc (working copy) @@ -1 +1 @@ -#include "x2nontrivinit.h" +#include "x0nontrivinit.h" Index: gcc/testsuite/g++.dg/pph/c1functions.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1functions.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1functions.h (working copy) @@ -1,5 +0,0 @@ -#ifndef C1FUNCTIONS_H -#define C1FUNCTIONS_H -extern int extern_only(int); // -extern int extern_then_body(int); // -#endif Index: gcc/testsuite/g++.dg/pph/c0builtin-objsize.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0builtin-objsize.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0builtin-objsize.h (working copy) @@ -1,7 +1,8 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H /* { dg-options "-w -fpermissive" } */ +#ifndef C0BUILTIN_OBJSIZE_H +#define C0BUILTIN_OBJSIZE_H + typedef __SIZE_TYPE__ size_t; extern void abort (void); extern void exit (int); Index: gcc/testsuite/g++.dg/pph/c1-20060625-1.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1-20060625-1.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/c1-20060625-1.cc (working copy) @@ -1 +1 @@ -#include "c120060625-1.h" +#include "c0-20060625-1.h" Index: gcc/testsuite/g++.dg/pph/x1typerefs.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1typerefs.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1typerefs.cc (working copy) @@ -1,7 +0,0 @@ -#include "x1typerefs.h" - -int derived::method() { - return field; -} - -vderived variable; Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn1a.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn1a.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn1a.hi (working copy) @@ -1,8 +0,0 @@ -template< typename T > -dynarray<T>::dynarray(size_type c) -: store( alloc( c ) ), count( c ) -{ } - -template< typename T > -dynarray<T>::~dynarray() -{ delete[] store; } Index: gcc/testsuite/g++.dg/pph/c1builtin3.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1builtin3.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c1builtin3.h (working copy) @@ -1,6 +1,6 @@ -#ifndef C2BUILTIN3_H -#define C2BUILTIN3_H -#include "c2builtin1.h" +#ifndef C1BUILTIN3_H +#define C1BUILTIN3_H +#include "c0builtin1.h" const char *refile = VALUE(__FILE__); const char *reline = VALUE(__LINE__); #endif Index: gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.cc (working copy) @@ -1,3 +0,0 @@ -/* { dg-options "-w" } */ -// pph asm xdiff -#include "c1attr-warn-unused-result.h" Index: gcc/testsuite/g++.dg/pph/p1mean.cc =================================================================== --- gcc/testsuite/g++.dg/pph/p1mean.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/p1mean.cc (working copy) @@ -1,165 +0,0 @@ -// { dg-timeout 2 { target *-*-* } } -// { dg-xfail-if "INFINITE" { "*-*-*" } { "-fpph-map=pph.map" } } - -#include <stdlib.h> -#include <stdio.h> -#include <math.h> -#include <string.h> - -static unsigned long long MAX_ITEMS = 10000; - -static int -cmpdouble (const void *p1, const void *p2) -{ - double n1 = *((double *)p1); - double n2 = *((double *)p2); - - if (n1 < n2) - return -1; - else if (n1 > n2) - return 1; - else - return 0; -} - - -double -compute_median (int n, double vec[]) -{ - qsort (vec, n, sizeof (double), cmpdouble); - - if (n % 2 == 0) - return ((vec[n / 2] + vec[n / 2 - 1]) / 2.0); - else - return vec[n / 2]; -} - -double -compute_stddev (int n, double avg, double vec[]) -{ - double sd, sum, s, x; - int i; - - for (x = 0.0, sum = 0.0, i = 0; i < n; i++) - { - double d; - - x = x + vec[i]; - d = vec[i] - avg; - sum += d * d; - } - - s = sum / n; - sd = sqrt (s); - - return sd; -} - - -int -main (int argc, char *argv[]) -{ - double *vec; - double x, sum, product, inverse_sum, arithmetic, geometric, harmonic; - double min, max, median, variance, stddev; - int count; - int ret; - - sum = 0.0; - product = 1.0; - inverse_sum = 0.0; - count = 0; - min = 0.0; - max = 0.0; - - vec = (double *) malloc (MAX_ITEMS * sizeof (double)); - - while (1) - { - ret = scanf ("%lg", &x); - if (ret == EOF) - break; - - if (count == 0) - min = max = x; - - if (x < min) - min = x; - - if (x > max) - max = x; - - sum += x; - product *= x; - inverse_sum += 1.0 / x; - vec[count] = x; - - count++; - if (count >= MAX_ITEMS) - { - MAX_ITEMS *= 3; - vec = (double *) realloc (vec, MAX_ITEMS * sizeof (double)); - } - } - - int do_min = (strstr (argv[0], "min") != NULL); - int do_max = (strstr (argv[0], "max") != NULL); - int do_avg = (strstr (argv[0], "avg") != NULL); - int do_geo = (strstr (argv[0], "geoavg") != NULL); - int do_harmonic = (strstr (argv[0], "harmonic") != NULL); - int do_median = (strstr (argv[0], "median") != NULL); - int do_variance = (strstr (argv[0], "variance") != NULL); - int do_stdev = (strstr (argv[0], "stdev") != NULL); - int do_all = (argc > 1 && strcmp (argv[1], "-a") == 0); - - if (count > 0) - { - arithmetic = sum / count; - geometric = pow (product, (double) 1.0 / (double) count); - harmonic = count / inverse_sum; - median = compute_median (count, vec); - stddev = compute_stddev (count, arithmetic, vec); - variance = stddev * stddev; - - if (do_all) - { - printf ("# of items read --> %d\n", count); - printf ("Min --------------> %lg\n", min); - printf ("Max --------------> %lg\n", max); - printf ("Arithmetic mean --> %lg\n", arithmetic); - printf ("Geometric mean ---> %lg\n", geometric); - printf ("Harmonic mean ----> %lg\n", harmonic); - printf ("Median -----------> %lg\n", median); - printf ("Variance ---------> %lg\n", variance); - printf ("Standard dev -----> %lg\n", stddev); - } - else if (do_min) - printf ("%lg\n", min); - else if (do_max) - printf ("%lg\n", max); - else if (do_avg) - printf ("%lg\n", arithmetic); - else if (do_geo) - printf ("%lg\n", geometric); - else if (do_harmonic) - printf ("%lg\n", harmonic); - else if (do_median) - printf ("%lg\n", median); - else if (do_variance) - printf ("%lg\n", variance); - else if (do_stdev) - printf ("%lg\n", stddev); - else - { - fprintf (stderr, "ERROR: Unknown value '%s' to compute\n", argv[0]); - return 1; - } - } - else - { - fprintf (stderr, "ERROR: none of the input is positive\n"); - return 1; - } - - return 0; -} Index: gcc/testsuite/g++.dg/pph/c1limits-externalid.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1limits-externalid.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1limits-externalid.cc (working copy) @@ -1 +1 @@ -#include "c1limits-externalid.h" +#include "c0limits-externalid.h" Index: gcc/testsuite/g++.dg/pph/c1multinc1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1multinc1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1multinc1.h (working copy) @@ -1,4 +0,0 @@ -#ifndef C1MULTINC1_H -#define C1MULTINC1_H -extern float f1; -#endif Index: gcc/testsuite/g++.dg/pph/c2builtin6.h =================================================================== --- gcc/testsuite/g++.dg/pph/c2builtin6.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2builtin6.h (working copy) @@ -1,6 +0,0 @@ -#ifndef C2BUILTIN6_H -#define C2BUILTIN6_H -#include "a2builtin4.h" -const char *refile = VALUE(__FILE__); -const char *reline = VALUE(__LINE__); -#endif Index: gcc/testsuite/g++.dg/pph/c1empty.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1empty.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1empty.h (working copy) @@ -1,3 +0,0 @@ -#ifndef C1EMPTY_H -#define C1EMPTY_H -#endif Index: gcc/testsuite/g++.dg/pph/x1dynarray3.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray3.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray3.cc (working copy) @@ -1,15 +0,0 @@ -// { dg-do run } - -#include "x1dynarray3.h" - -#include "a1integer.h" -typedef tst::dynarray< integer > integer_array; - -int main() -{ - #include "a1dynarray-use1.cci" - #include "a1dynarray-use2.cci" - #include "a1dynarray-use3a.cci" - #include "a1dynarray-use4a.cci" - return sum - 25; -} Index: gcc/testsuite/g++.dg/pph/x1ten-hellos.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1ten-hellos.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1ten-hellos.h (working copy) @@ -1,25 +0,0 @@ -#ifndef A_H_ -#define A_H_ -extern "C" { - int printf(const char*, ...); - void abort(void); - void exit(int); -}; - -class A -{ -public: - A() { - x_ = 0; - printf ("constructing\n"); - } - - void hello(void) { - x_++; - printf ("Hello World (%d)\n", x_); - } - -private: - int x_; -}; -#endif Index: gcc/testsuite/g++.dg/pph/c1funcstatic.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1funcstatic.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1funcstatic.cc (working copy) @@ -1,2 +1,2 @@ -#include "c1funcstatic.h" +#include "c0funcstatic.h" int g() { return f(); } Index: gcc/testsuite/g++.dg/pph/c1functions.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1functions.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1functions.cc (working copy) @@ -1,4 +1,4 @@ -#include "c1functions.h" +#include "c0functions.h" int extern_then_body(int i) // need body, merge head to body { return extern_only( i ); } static int fwdref_static(int); Index: gcc/testsuite/g++.dg/pph/c1multinc.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1multinc.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1multinc.cc (working copy) @@ -1,5 +0,0 @@ -#include "c1multinc2.h" -void foo (void) -{ - int x = var1 + var2 - (int) f1; -} Index: gcc/testsuite/g++.dg/pph/a1dynarray-use3b.cci =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-use3b.cci (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-use3b.cci (working copy) @@ -1,8 +0,0 @@ - try { - integer t = target.at(32); - } - catch ( std::out_of_range ) { - } - catch ( ... ) { - return 1; - } Index: gcc/testsuite/g++.dg/pph/c2paste.h =================================================================== --- gcc/testsuite/g++.dg/pph/c2paste.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2paste.h (working copy) @@ -1,5 +0,0 @@ -#ifndef C2PASTE_H -#define C2PASTE_H -#define major "beef" -#define M(major) foo##_##major##_(major) -#endif Index: gcc/testsuite/g++.dg/pph/c0eabi1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0eabi1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0eabi1.h (working copy) @@ -2,8 +2,8 @@ // FIXME pph - Enabling PPH for this file causes memory problems in cc1plus. // c1eabi1.h c1eabi1.pph -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H +#ifndef C0EABI1_H +#define C0EABI1_H /* This file tests most of the non-C++ run-time helper functions described in Section 4 of the "Run-Time ABI for the ARM @@ -30,9 +30,9 @@ There are also no tests for the "division by zero", "memory copying, clearing, and setting" functions. */ -/* Simplified version of c2eabi1.cc - Do not include other system - headers here. Simply forward declare the library functions used - by this header. */ +/* Simplified version of c2eabi1.cc + - Do not include other system headers here. + Simply forward declare the library functions used by this header. */ extern "C" { extern void abort(void); extern int abs(int); Index: gcc/testsuite/g++.dg/pph/a1dynarray-dcl1.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dcl1.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dcl1.hi (working copy) @@ -1,6 +0,0 @@ - // parameter-based types: - typedef T value_type; - typedef T& reference; - typedef const T& const_reference; - typedef T* iterator; - typedef const T* const_iterator; Index: gcc/testsuite/g++.dg/pph/x2overload3.h =================================================================== --- gcc/testsuite/g++.dg/pph/x2overload3.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x2overload3.h (working copy) @@ -1,9 +0,0 @@ -#ifndef X2OVERLOAD3_H -#define X2OVERLOAD3_H -#include "x2overload1.h" -inline int f() -{ - float x = 2.3f; - return o(x); -} -#endif Index: gcc/testsuite/g++.dg/pph/x1typerefs.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1typerefs.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1typerefs.h (working copy) @@ -1,6 +1,6 @@ #ifndef X1TYPEREFS_H #define X1TYPEREFS_H -#include "c1typerefs.h" +#include "c0typerefs.h" struct derived : base { int method(); }; Index: gcc/testsuite/g++.dg/pph/c1pr44948-1a.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1pr44948-1a.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1pr44948-1a.cc (working copy) @@ -1,3 +1,3 @@ // { dg-xfail-if "INFINITE" { "*-*-*" } { "-fpph-map=pph.map" } } // { dg-bogus "internal compiler error: in lto_streamer_cache_get, at lto-streamer.c" "" { xfail *-*-* } 0 } -#include "c1pr44948-1a.h" +#include "c0pr44948-1a.h" Index: gcc/testsuite/g++.dg/pph/x1hardlookup.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1hardlookup.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1hardlookup.h (working copy) @@ -1,18 +0,0 @@ -#ifndef X1HARDLOOKUP_H -#define X1HARDLOOKUP_H -struct V { int a; static int b;}; -namespace N { - int V; - struct C { }; - int operator + (int i, C c); - C O; - int I(int arg) - { return arg + V; } - struct V w; - int x = V::b; -} - -int V; -struct D { }; -int operator + (int i, D d); -#endif Index: gcc/testsuite/g++.dg/pph/c120060625-1.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c120060625-1.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c120060625-1.cc (working copy) @@ -1 +0,0 @@ -#include "c120060625-1.h" Index: gcc/testsuite/g++.dg/pph/c1builtin-integral.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1builtin-integral.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/c1builtin-integral.cc (working copy) @@ -1,2 +1,2 @@ // pph asm xdiff -#include "c1builtin-integral-1.h" +#include "c0builtin-integral.h" Index: gcc/testsuite/g++.dg/pph/x0nontrivinit.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0nontrivinit.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0nontrivinit.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X2NONTRIVINIT_H -#define X2NONTRIVINIT_H +#ifndef X0NONTRIVINIT_H +#define X0NONTRIVINIT_H int y = 0; int x = y+1; #endif Index: gcc/testsuite/g++.dg/pph/x7dynarray6.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x7dynarray6.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/x7dynarray6.cc (working copy) @@ -6,23 +6,23 @@ #include <algorithm> #include <iostream> -#include "x1dynarray6.h" +#include "x6dynarray6.h" -#include "a1integer.h" +#include "a0integer.h" typedef tst::dynarray< integer > integer_array; -#include "a1dynarray-hlp1.cci" +#include "a0dynarray-hlp1.cci" int main() { - #include "a1dynarray-use1.cci" + #include "a0dynarray-use1.cci" dump( source ); dump( sorted ); std::sort( sorted.begin(), sorted.end() ); dump( sorted ); - #include "a1dynarray-use2.cci" + #include "a0dynarray-use2.cci" dump( target ); - #include "a1dynarray-use3b.cci" - #include "a1dynarray-use4a.cci" + #include "a0dynarray-use3b.cci" + #include "a0dynarray-use4a.cci" return sum - 23; } Index: gcc/testsuite/g++.dg/pph/x6dynarray5.h =================================================================== --- gcc/testsuite/g++.dg/pph/x6dynarray5.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x6dynarray5.h (working copy) @@ -1,16 +1,16 @@ -#ifndef X1DYNARRAY5_H -#define X1DYNARRAY5_H +#ifndef X6DYNARRAY5_H +#define X6DYNARRAY5_H -#include "x1dynarray4.h" +#include "x0dynarray4.h" #include <new> #include <memory> namespace tst { -#include "a1dynarray-dfn1b.hi" -#include "a1dynarray-dfn2c.hi" -#include "a1dynarray-dfn3b.hi" +#include "a0dynarray-dfn1b.hi" +#include "a0dynarray-dfn2c.hi" +#include "a0dynarray-dfn3b.hi" } // namespace tst Index: gcc/testsuite/g++.dg/pph/a1dynarray-use4a.cci =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-use4a.cci (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-use4a.cci (working copy) @@ -1,5 +0,0 @@ - int sum = 0; - for ( integer_array::iterator it = target.begin(); - it != target.end(); - ++it ) - sum += *it; Index: gcc/testsuite/g++.dg/pph/c1eabi1.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1eabi1.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1eabi1.cc (working copy) @@ -1,7 +1,6 @@ // { dg-options "-w -fpermissive" } -// pph asm xdiff -#include "c1eabi1.h" +#include "c0eabi1.h" int main () { unsigned char bytes[256]; Index: gcc/testsuite/g++.dg/pph/c0varorder.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0varorder.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0varorder.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __C1VARORDER_H -#define __C1VARORDER_H +#ifndef C0VARORDER_H +#define C0VARORDER_H int var1; int var2; Index: gcc/testsuite/g++.dg/pph/c0builtin1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0builtin1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0builtin1.h (working copy) @@ -1,5 +1,5 @@ -#ifndef C2BUILTIN1_H -#define C2BUILTIN1_H +#ifndef C0BUILTIN1_H +#define C0BUILTIN1_H #define QUOTE(arg) #arg #define VALUE(arg) QUOTE(arg) #endif Index: gcc/testsuite/g++.dg/pph/c3builtin1.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c3builtin1.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/c3builtin1.cc (working copy) @@ -1,3 +1,3 @@ -#include "c2builtin1.h" -#include "c2builtin2.h" -#include "c2builtin3.h" +#include "c0builtin1.h" +#include "c1builtin2.h" +#include "c1builtin3.h" Index: gcc/testsuite/g++.dg/pph/c0dupguard1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0dupguard1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0dupguard1.h (working copy) @@ -1,4 +1,4 @@ -#ifndef C2DUPGUARD_H -#define C2DUPGUARD_H +#ifndef C0DUPGUARD_H +#define C0DUPGUARD_H extern int x; #endif Index: gcc/testsuite/g++.dg/pph/x1functions.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1functions.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1functions.cc (working copy) @@ -1,9 +0,0 @@ -// pph asm xdiff - -#include "x1functions.h" - -int type::mbr_decl_then_def(int i) // need body -{ return mbr_decl_inline( i ); } - -int type::mbr_inl_then_def(int i) // lazy body -{ return mbr_decl_then_def( i ); } Index: gcc/testsuite/g++.dg/pph/c1multinc2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1multinc2.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1multinc2.h (working copy) @@ -1,8 +0,0 @@ -#ifndef C1MULTINC2 -#define C1MULTINC2 -#include "c1altinc1.h" -extern void foo (void); -extern int var1; -extern int var2; -#include "c1altinc1.h" -#endif Index: gcc/testsuite/g++.dg/pph/x1dynarray1.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray1.h (working copy) @@ -1,19 +0,0 @@ -#ifndef X1DYNARRAY1_H -#define X1DYNARRAY1_H - -extern "C" void *memcpy(void *dest, const void *src, unsigned long n); -extern "C" void exit(int) throw(); - -template< typename T > -struct dynarray -{ - #include "a1dynarray-dcl1.hi" - #include "a1dynarray-dcl2a.hi" - #include "a1dynarray-dcl3.hi" -}; - -#include "a1dynarray-dfn1a.hi" -#include "a1dynarray-dfn2a.hi" -#include "a1dynarray-dfn3a.hi" - -#endif Index: gcc/testsuite/g++.dg/pph/x5dynarray3.h =================================================================== --- gcc/testsuite/g++.dg/pph/x5dynarray3.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x5dynarray3.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1DYNARRAY3_H -#define X1DYNARRAY3_H +#ifndef X5DYNARRAY3_H +#define X5DYNARRAY3_H #include <stddef.h> #include <new> @@ -9,14 +9,14 @@ namespace tst { template< typename T > struct dynarray { - #include "a1dynarray-dcl1.hi" - #include "a1dynarray-dcl2b.hi" - #include "a1dynarray-dcl3.hi" + #include "a0dynarray-dcl1.hi" + #include "a0dynarray-dcl2b.hi" + #include "a0dynarray-dcl3.hi" }; -#include "a1dynarray-dfn1b.hi" -#include "a1dynarray-dfn2b.hi" -#include "a1dynarray-dfn3b.hi" +#include "a0dynarray-dfn1b.hi" +#include "a0dynarray-dfn2b.hi" +#include "a0dynarray-dfn3b.hi" } // namespace tst Index: gcc/testsuite/g++.dg/pph/c1builtin-objsize.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1builtin-objsize.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/c1builtin-objsize.cc (working copy) @@ -1,2 +1,2 @@ /* { dg-options "-O2 -w -fpermissive" } */ -#include "c1builtin-object-size-2.h" +#include "c0builtin-objsize.h" Index: gcc/testsuite/g++.dg/pph/c0paste.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0paste.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0paste.h (working copy) @@ -1,5 +1,5 @@ -#ifndef C2PASTE_H -#define C2PASTE_H +#ifndef C0PASTE_H +#define C0PASTE_H #define major "beef" #define M(major) foo##_##major##_(major) #endif Index: gcc/testsuite/g++.dg/pph/c0return-5.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0return-5.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0return-5.h (working copy) @@ -1,7 +1,7 @@ // { dg-options "-mpreferred-stack-boundary=4" } -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H +#ifndef C0RETURN_5_H +#define C0RETURN_5_H /* This compile only test is to detect an assertion failure in stack branch development. */ Index: gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.h (working copy) @@ -1,395 +0,0 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H -/* { dg-options "-w -fpermissive" } */ - -typedef __SIZE_TYPE__ size_t; -extern void abort (void); -extern void exit (int); -extern void *malloc (size_t); -extern void *calloc (size_t, size_t); -extern void *alloca (size_t); -extern void *memcpy (void *, const void *, size_t); -extern void *memset (void *, int, size_t); -extern char *strcpy (char *, const char *); - -struct A -{ - char a[10]; - int b; - char c[10]; -} y, w[4]; - -extern char exta[]; -extern char extb[30]; -extern struct A extc[]; -struct A zerol[0]; - -void -__attribute__ ((noinline)) -test1 (void *q, int x) -{ - struct A a; - void *p = &a.a[3], *r; - char var[x + 10]; - struct A vara[x + 10]; - if (x < 0) - r = &a.a[9]; - else - r = &a.c[1]; - if (__builtin_object_size (p, 1) != sizeof (a.a) - 3) - abort (); - if (__builtin_object_size (&a.c[9], 1) - != sizeof (a.c) - 9) - abort (); - if (__builtin_object_size (q, 1) != (size_t) -1) - abort (); - if (__builtin_object_size (r, 1) != sizeof (a.c) - 1) - abort (); - if (x < 6) - r = &w[2].a[1]; - else - r = &a.a[6]; - if (__builtin_object_size (&y, 1) != sizeof (y)) - abort (); - if (__builtin_object_size (w, 1) != sizeof (w)) - abort (); - if (__builtin_object_size (&y.b, 1) != sizeof (a.b)) - abort (); - if (__builtin_object_size (r, 1) != sizeof (a.a) - 1) - abort (); - if (x < 20) - r = malloc (30); - else - r = calloc (2, 16); - if (__builtin_object_size (r, 1) != 2 * 16) - abort (); - if (x < 20) - r = malloc (30); - else - r = calloc (2, 14); - if (__builtin_object_size (r, 1) != 30) - abort (); - if (x < 30) - r = malloc (sizeof (a)); - else - r = &a.a[3]; - if (__builtin_object_size (r, 1) != sizeof (a)) - abort (); - r = memcpy (r, "a", 2); - if (__builtin_object_size (r, 1) != sizeof (a)) - abort (); - r = memcpy (r + 2, "b", 2) + 2; - if (__builtin_object_size (r, 1) != sizeof (a) - 4) - abort (); - r = &a.a[4]; - r = memset (r, 'a', 2); - if (__builtin_object_size (r, 1) != sizeof (a.a) - 4) - abort (); - r = memset (r + 2, 'b', 2) + 2; - if (__builtin_object_size (r, 1) != sizeof (a.a) - 8) - abort (); - r = &a.a[1]; - r = strcpy (r, "ab"); - if (__builtin_object_size (r, 1) != sizeof (a.a) - 1) - abort (); - r = strcpy (r + 2, "cd") + 2; - if (__builtin_object_size (r, 1) != sizeof (a.a) - 5) - abort (); - if (__builtin_object_size (exta, 1) != (size_t) -1) - abort (); - if (__builtin_object_size (exta + 10, 1) != (size_t) -1) - abort (); - if (__builtin_object_size (&exta[5], 1) != (size_t) -1) - abort (); - if (__builtin_object_size (extb, 1) != sizeof (extb)) - abort (); - if (__builtin_object_size (extb + 10, 1) != sizeof (extb) - 10) - abort (); - if (__builtin_object_size (&extb[5], 1) != sizeof (extb) - 5) - abort (); - if (__builtin_object_size (extc, 1) != (size_t) -1) - abort (); - if (__builtin_object_size (extc + 10, 1) != (size_t) -1) - abort (); - if (__builtin_object_size (&extc[5], 1) != (size_t) -1) - abort (); - if (__builtin_object_size (&extc->a, 1) != (size_t) -1) - abort (); - if (__builtin_object_size (&(extc + 10)->b, 1) != (size_t) -1) - abort (); - if (__builtin_object_size (&extc[5].c[3], 1) != (size_t) -1) - abort (); - if (__builtin_object_size (var, 1) != (size_t) -1) - abort (); - if (__builtin_object_size (var + 10, 1) != (size_t) -1) - abort (); - if (__builtin_object_size (&var[5], 1) != (size_t) -1) - abort (); - if (__builtin_object_size (vara, 1) != (size_t) -1) - abort (); - if (__builtin_object_size (vara + 10, 1) != (size_t) -1) - abort (); - if (__builtin_object_size (&vara[5], 1) != (size_t) -1) - abort (); - if (__builtin_object_size (&vara[0].a, 1) != sizeof (vara[0].a)) - abort (); - if (__builtin_object_size (&vara[10].a[0], 1) != sizeof (vara[0].a)) - abort (); - if (__builtin_object_size (&vara[5].a[4], 1) != sizeof (vara[0].a) - 4) - abort (); - if (__builtin_object_size (&vara[5].b, 1) != sizeof (vara[0].b)) - abort (); - if (__builtin_object_size (&vara[7].c[7], 1) != sizeof (vara[0].c) - 7) - abort (); - if (__builtin_object_size (zerol, 1) != 0) - abort (); - if (__builtin_object_size (&zerol, 1) != 0) - abort (); - if (__builtin_object_size (&zerol[0], 1) != 0) - abort (); - if (__builtin_object_size (zerol[0].a, 1) != 0) - abort (); - if (__builtin_object_size (&zerol[0].a[0], 1) != 0) - abort (); - if (__builtin_object_size (&zerol[0].b, 1) != 0) - abort (); - if (__builtin_object_size ("abcdefg", 1) != sizeof ("abcdefg")) - abort (); - if (__builtin_object_size ("abcd\0efg", 1) != sizeof ("abcd\0efg")) - abort (); - if (__builtin_object_size (&"abcd\0efg", 1) != sizeof ("abcd\0efg")) - abort (); - if (__builtin_object_size (&"abcd\0efg"[0], 1) != sizeof ("abcd\0efg")) - abort (); - if (__builtin_object_size (&"abcd\0efg"[4], 1) != sizeof ("abcd\0efg") - 4) - abort (); - if (__builtin_object_size ("abcd\0efg" + 5, 1) != sizeof ("abcd\0efg") - 5) - abort (); - if (__builtin_object_size (L"abcdefg", 1) != sizeof (L"abcdefg")) - abort (); - r = (char *) L"abcd\0efg"; - if (__builtin_object_size (r + 2, 1) != sizeof (L"abcd\0efg") - 2) - abort (); -} - -size_t l1 = 1; - -void -__attribute__ ((noinline)) -test2 (void) -{ - struct B { char buf1[10]; char buf2[10]; } a; - char *r, buf3[20]; - int i; - - if (sizeof (a) != 20) - return; - - r = buf3; - for (i = 0; i < 4; ++i) - { - if (i == l1 - 1) - r = &a.buf1[1]; - else if (i == l1) - r = &a.buf2[7]; - else if (i == l1 + 1) - r = &buf3[5]; - else if (i == l1 + 2) - r = &a.buf1[9]; - } - if (__builtin_object_size (r, 1) != sizeof (buf3)) - abort (); - r = &buf3[20]; - for (i = 0; i < 4; ++i) - { - if (i == l1 - 1) - r = &a.buf1[7]; - else if (i == l1) - r = &a.buf2[7]; - else if (i == l1 + 1) - r = &buf3[5]; - else if (i == l1 + 2) - r = &a.buf1[9]; - } - if (__builtin_object_size (r, 1) != sizeof (buf3) - 5) - abort (); - r += 8; - if (__builtin_object_size (r, 1) != sizeof (buf3) - 13) - abort (); - if (__builtin_object_size (r + 6, 1) != sizeof (buf3) - 19) - abort (); -} - -void -__attribute__ ((noinline)) -test3 (void) -{ - char buf4[10]; - struct B { struct A a[2]; struct A b; char c[4]; char d; double e; - _Complex double f; } x; - double y; - _Complex double z; - double *dp; - - if (__builtin_object_size (buf4, 1) != sizeof (buf4)) - abort (); - if (__builtin_object_size (&buf4, 1) != sizeof (buf4)) - abort (); - if (__builtin_object_size (&buf4[0], 1) != sizeof (buf4)) - abort (); - if (__builtin_object_size (&buf4[1], 1) != sizeof (buf4) - 1) - abort (); - if (__builtin_object_size (&x, 1) != sizeof (x)) - abort (); - if (__builtin_object_size (&x.a, 1) != sizeof (x.a)) - abort (); - if (__builtin_object_size (&x.a[0], 1) != sizeof (x.a)) - abort (); - if (__builtin_object_size (&x.a[0].a, 1) != sizeof (x.a[0].a)) - abort (); - if (__builtin_object_size (&x.a[0].a[0], 1) != sizeof (x.a[0].a)) - abort (); - if (__builtin_object_size (&x.a[0].a[3], 1) != sizeof (x.a[0].a) - 3) - abort (); - if (__builtin_object_size (&x.a[0].b, 1) != sizeof (x.a[0].b)) - abort (); - if (__builtin_object_size (&x.a[1].c, 1) != sizeof (x.a[1].c)) - abort (); - if (__builtin_object_size (&x.a[1].c[0], 1) != sizeof (x.a[1].c)) - abort (); - if (__builtin_object_size (&x.a[1].c[3], 1) != sizeof (x.a[1].c) - 3) - abort (); - if (__builtin_object_size (&x.b, 1) != sizeof (x.b)) - abort (); - if (__builtin_object_size (&x.b.a, 1) != sizeof (x.b.a)) - abort (); - if (__builtin_object_size (&x.b.a[0], 1) != sizeof (x.b.a)) - abort (); - if (__builtin_object_size (&x.b.a[3], 1) != sizeof (x.b.a) - 3) - abort (); - if (__builtin_object_size (&x.b.b, 1) != sizeof (x.b.b)) - abort (); - if (__builtin_object_size (&x.b.c, 1) != sizeof (x.b.c)) - abort (); - if (__builtin_object_size (&x.b.c[0], 1) != sizeof (x.b.c)) - abort (); - if (__builtin_object_size (&x.b.c[3], 1) != sizeof (x.b.c) - 3) - abort (); - if (__builtin_object_size (&x.c, 1) != sizeof (x.c)) - abort (); - if (__builtin_object_size (&x.c[0], 1) != sizeof (x.c)) - abort (); - if (__builtin_object_size (&x.c[1], 1) != sizeof (x.c) - 1) - abort (); - if (__builtin_object_size (&x.d, 1) != sizeof (x.d)) - abort (); - if (__builtin_object_size (&x.e, 1) != sizeof (x.e)) - abort (); - if (__builtin_object_size (&x.f, 1) != sizeof (x.f)) - abort (); - dp = &__real__ x.f; - if (__builtin_object_size (dp, 1) != sizeof (x.f) / 2) - abort (); - dp = &__imag__ x.f; - if (__builtin_object_size (dp, 1) != sizeof (x.f) / 2) - abort (); - dp = &y; - if (__builtin_object_size (dp, 1) != sizeof (y)) - abort (); - if (__builtin_object_size (&z, 1) != sizeof (z)) - abort (); - dp = &__real__ z; - if (__builtin_object_size (dp, 1) != sizeof (z) / 2) - abort (); - dp = &__imag__ z; - if (__builtin_object_size (dp, 1) != sizeof (z) / 2) - abort (); -} - -struct S { unsigned int a; }; - -char * -__attribute__ ((noinline)) -test4 (char *x, int y) -{ - register int i; - struct A *p; - - for (i = 0; i < y; i++) - { - p = (struct A *) x; - x = (char *) &p[1]; - if (__builtin_object_size (p, 1) != (size_t) -1) - abort (); - } - return x; -} - -void -__attribute__ ((noinline)) -test5 (size_t x) -{ - struct T { char buf[64]; char buf2[64]; } t; - char *p = &t.buf[8]; - size_t i; - - for (i = 0; i < x; ++i) - p = p + 4; - if (__builtin_object_size (p, 1) != sizeof (t.buf) - 8) - abort (); - memset (p, ' ', sizeof (t.buf) - 8 - 4 * 4); -} - -void -__attribute__ ((noinline)) -test6 (void) -{ - char buf[64]; - struct T { char buf[64]; char buf2[64]; } t; - char *p = &buf[64], *q = &t.buf[64]; - - if (__builtin_object_size (p + 64, 1) != 0) - abort (); - if (__builtin_object_size (q + 0, 1) != 0) - abort (); - if (__builtin_object_size (q + 64, 1) != 0) - abort (); -} - -void -__attribute__ ((noinline)) -test7 (void) -{ - struct T { char buf[10]; char buf2[10]; } t; - char *p = &t.buf2[-4]; - char *q = &t.buf2[0]; - if (__builtin_object_size (p, 1) != 0) - abort (); - if (__builtin_object_size (q, 1) != sizeof (t.buf2)) - abort (); - q = &t.buf[10]; - if (__builtin_object_size (q, 1) != 0) - abort (); - q = &t.buf[11]; - if (__builtin_object_size (q, 1) != 0) - abort (); - p = &t.buf[-4]; - if (__builtin_object_size (p, 1) != 0) - abort (); -} - -int -main (void) -{ - struct S s[10]; - __asm ("" : "=r" (l1) : "0" (l1)); - test1 (main, 6); - test2 (); - test3 (); - test4 ((char *) s, 10); - test5 (4); - test6 (); - test7 (); - exit (0); -} -#endif Index: gcc/testsuite/g++.dg/pph/c1field.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1field.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1field.h (working copy) @@ -1,7 +0,0 @@ -#ifndef C1FIELD_H -#define C1FIELD_H -typedef int language; -struct program { - language field; -}; -#endif Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn1b.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn1b.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn1b.hi (working copy) @@ -1,23 +0,0 @@ -template< typename T > -dynarray<T>::dynarray(size_type c) -: store( alloc( c ) ), count( c ) -{ - size_type i; - try { - for ( size_type i = 0; i < count; ++i ) - new (store+i) T; - } - catch ( ... ) { - for ( ; i > 0; --i ) - (store+(i-1))->~T(); - throw; - } -} - -template< typename T > -dynarray<T>::~dynarray() -{ - for ( size_type i = 0; i < count; ++i ) - (store+i)->~T(); - delete[] store; -} Index: gcc/testsuite/g++.dg/pph/c1altinc1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1altinc1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1altinc1.h (working copy) @@ -1,4 +0,0 @@ -#ifndef C1ALTINC1_H -#define C1ALTINC1_H -extern float f1; -#endif Index: gcc/testsuite/g++.dg/pph/x0template.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0template.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0template.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1TEMPLATE_H -#define X1TEMPLATE_H +#ifndef X0TEMPLATE_H +#define X0TEMPLATE_H extern int x; struct B; template< typename T > Index: gcc/testsuite/g++.dg/pph/c1typerefs.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1typerefs.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1typerefs.cc (working copy) @@ -1,4 +1,4 @@ -#include "c1typerefs.h" +#include "c0typerefs.h" int base_from_var() { base variable; } Index: gcc/testsuite/g++.dg/pph/x1dynarray4.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray4.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray4.cc (working copy) @@ -1,19 +0,0 @@ -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } -// { dg-bogus "cstdlib:42:0: error: PPH file stdlib.pph fails macro validation, __STDDEF_H__" "" { xfail *-*-* } 0 } - -#include "x1dynarray5.h" - -#include <algorithm> - -#include "a1integer.h" -typedef tst::dynarray< integer > integer_array; - -int main() -{ - #include "a1dynarray-use1.cci" - std::sort( sorted.begin(), sorted.end() ); - #include "a1dynarray-use2.cci" - #include "a1dynarray-use3a.cci" - #include "a1dynarray-use4a.cci" - return sum - 23; -} Index: gcc/testsuite/g++.dg/pph/c1altinc.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1altinc.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1altinc.cc (working copy) @@ -1,5 +0,0 @@ -#include "c1altinc2.h" -void foo (void) -{ - int x = var1 + var2 - (int) f1; -} Index: gcc/testsuite/g++.dg/pph/x6dynarray6.h =================================================================== --- gcc/testsuite/g++.dg/pph/x6dynarray6.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x6dynarray6.h (working copy) @@ -3,10 +3,10 @@ // { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } // { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } -#ifndef X1DYNARRAY6_H -#define X1DYNARRAY6_H +#ifndef X6DYNARRAY6_H +#define X6DYNARRAY6_H -#include "x1dynarray4.h" +#include "x0dynarray4.h" #include <new> #include <memory> @@ -14,9 +14,9 @@ namespace tst { -#include "a1dynarray-dfn1b.hi" -#include "a1dynarray-dfn2c.hi" -#include "a1dynarray-dfn3c.hi" +#include "a0dynarray-dfn1b.hi" +#include "a0dynarray-dfn2c.hi" +#include "a0dynarray-dfn3c.hi" } // namespace tst Index: gcc/testsuite/g++.dg/pph/c1funcmac.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1funcmac.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1funcmac.h (working copy) @@ -1,7 +0,0 @@ -#ifndef C1FUNCMAC_H -#define C1FUNCMAC_H -#define gnu_dev_major(dev) long dev -#define gnu_dev_minor(dev) short dev -#define major(dev) gnu_dev_major (dev) -#define minor(dev) gnu_dev_minor (dev) -#endif Index: gcc/testsuite/g++.dg/pph/x1globalref.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1globalref.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1globalref.cc (working copy) @@ -1,6 +1,6 @@ // pph asm xdiff -#include "x1globalref.h" +#include "x0globalref.h" type x = 2; type y = x; Index: gcc/testsuite/g++.dg/pph/c1struct.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1struct.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1struct.cc (working copy) @@ -1,4 +1,4 @@ -#include "c1struct.h" +#include "c0struct.h" thing var1; thing var2 = { 3 }; Index: gcc/testsuite/g++.dg/pph/x0tmplclass.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0tmplclass.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0tmplclass.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1TMPLCLASS_H -#define X1TMPLCLASS_H +#ifndef X0TMPLCLASS_H +#define X0TMPLCLASS_H template< typename T > struct wrapper { T value; Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn2a.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn2a.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn2a.hi (working copy) @@ -1,4 +0,0 @@ -template< typename T > -dynarray<T>::dynarray(const dynarray& d) -: store( alloc( d.count ) ), count( d.count ) -{ memcpy( store, d.store, count * sizeof(T) ); } Index: gcc/testsuite/g++.dg/pph/x1struct0.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1struct0.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1struct0.h (working copy) @@ -1,7 +0,0 @@ -#ifndef X1STRUCT0_H -#define X1STRUCT0_H -typedef int type; -struct B { -}; -typedef B thing; -#endif Index: gcc/testsuite/g++.dg/pph/c0dupguard2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0dupguard2.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0dupguard2.h (working copy) @@ -1,4 +1,4 @@ -#ifndef C2DUPGUARD_H -#define C2DUPGUARD_H +#ifndef C0DUPGUARD_H +#define C0DUPGUARD_H extern int x; #endif Index: gcc/testsuite/g++.dg/pph/x0ten-hellos.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0ten-hellos.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0ten-hellos.h (working copy) @@ -1,5 +1,5 @@ -#ifndef A_H_ -#define A_H_ +#ifndef X0TEN_HELLOS_H +#define X0TEN_HELLOS_H extern "C" { int printf(const char*, ...); void abort(void); Index: gcc/testsuite/g++.dg/pph/x1dynarray2.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray2.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray2.h (working copy) @@ -1,23 +0,0 @@ -#ifndef X1DYNARRAY2_H -#define X1DYNARRAY2_H - -extern "C" void *memcpy(void *dest, const void *src, unsigned long n); -extern "C" void exit(int) throw(); - -namespace tst { - -template< typename T > -struct dynarray -{ - #include "a1dynarray-dcl1.hi" - #include "a1dynarray-dcl2a.hi" - #include "a1dynarray-dcl3.hi" -}; - -#include "a1dynarray-dfn1a.hi" -#include "a1dynarray-dfn2a.hi" -#include "a1dynarray-dfn3a.hi" - -} // namespace tst - -#endif Index: gcc/testsuite/g++.dg/pph/c1funcstatic.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1funcstatic.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1funcstatic.h (working copy) @@ -1,7 +0,0 @@ -#ifndef C1FUNCSTATIC_H -#define C1FUNCSTATIC_H -static int f() { - static int x = 3; - return x++; -} -#endif Index: gcc/testsuite/g++.dg/pph/c0functions.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0functions.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0functions.h (working copy) @@ -1,5 +1,5 @@ -#ifndef C1FUNCTIONS_H -#define C1FUNCTIONS_H +#ifndef C0FUNCTIONS_H +#define C0FUNCTIONS_H extern int extern_only(int); // extern int extern_then_body(int); // #endif Index: gcc/testsuite/g++.dg/pph/x7dynarray7.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x7dynarray7.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/x7dynarray7.cc (working copy) @@ -6,23 +6,23 @@ #include <algorithm> #include <iostream> -#include "x1dynarray7.h" +#include "x5dynarray7.h" -#include "a1integer.h" +#include "a0integer.h" typedef tst::dynarray< integer > integer_array; -#include "a1dynarray-hlp1.cci" +#include "a0dynarray-hlp1.cci" int main() { - #include "a1dynarray-use1.cci" + #include "a0dynarray-use1.cci" dump( source ); dump( sorted ); std::sort( sorted.begin(), sorted.end() ); dump( sorted ); - #include "a1dynarray-use2.cci" + #include "a0dynarray-use2.cci" dump( target ); - #include "a1dynarray-use3b.cci" - #include "a1dynarray-use4b.cci" + #include "a0dynarray-use3b.cci" + #include "a0dynarray-use4b.cci" return sum - 23; } Index: gcc/testsuite/g++.dg/pph/a1dynarray-use1.cci =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-use1.cci (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-use1.cci (working copy) @@ -1,4 +0,0 @@ - integer_array source(3); - for ( integer_array::size_type ix = 0; ix < source.size(); ++ix ) - source[ix] = integer(4 - ix); - integer_array sorted( source ); Index: gcc/testsuite/g++.dg/pph/d2dupguard.cc =================================================================== --- gcc/testsuite/g++.dg/pph/d2dupguard.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/d2dupguard.cc (working copy) @@ -1,3 +0,0 @@ -#include "c2dupguard1.h" -#include "c2dupguard2.h" // { dg-error "fails macro validation" "" { xfail *-*-* } } -int foo() { return x; } Index: gcc/testsuite/g++.dg/pph/c3multinc.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c3multinc.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/c3multinc.cc (working copy) @@ -1,4 +1,4 @@ -#include "c1multinc2.h" +#include "c3multinc2.h" void foo (void) { int x = var1 + var2 - (int) f1; Index: gcc/testsuite/g++.dg/pph/x1namespace.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1namespace.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1namespace.h (working copy) @@ -1,22 +0,0 @@ -#ifndef X1NAMESPACE_H -#define X1NAMESPACE_H -namespace A { -extern int x; -struct B; -template< typename T > -struct C { - T* b; - int method(); - int another() - { return *b; } -}; -template< typename T > -int C< T >::method() -{ return x; } -} // namespace A -struct D : A::C< int > { - int method(); - int another() - { return *b; } -}; -#endif Index: gcc/testsuite/g++.dg/pph/d1symnotinc.cc =================================================================== --- gcc/testsuite/g++.dg/pph/d1symnotinc.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/d1symnotinc.cc (working copy) @@ -1,4 +1,4 @@ // { dg-error "Cannot open PPH file for reading" } #define NAME v #define VALUE 1 -#include "d1symnotinc.h" +#include "d0symnotinc.h" Index: gcc/testsuite/g++.dg/pph/c3builtin2.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c3builtin2.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/c3builtin2.cc (working copy) @@ -1,3 +1,3 @@ -#include "a2builtin4.h" -#include "c2builtin5.h" -#include "c2builtin6.h" +#include "a0builtin4.h" +#include "c0builtin5.h" +#include "c0builtin6.h" Index: gcc/testsuite/g++.dg/pph/c4pr36533.h =================================================================== --- gcc/testsuite/g++.dg/pph/c4pr36533.h (revision 0) +++ gcc/testsuite/g++.dg/pph/c4pr36533.h (revision 0) @@ -0,0 +1,16 @@ +/* PR target/36533 */ +/* { dg-options "-w -fpermissive" } */ + +#ifndef C4PR36533_H +#define C4PR36533_H + +#include <sys/mman.h> +#include <string.h> + +#ifndef MAP_ANONYMOUS +#define MAP_ANONYMOUS MAP_ANON +#endif + +#include "a0pr36533.h" + +#endif Index: gcc/testsuite/g++.dg/pph/c1altinc2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1altinc2.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1altinc2.h (working copy) @@ -1,12 +0,0 @@ -#ifndef C1ALTINC2 -#define C1ALTINC2 -extern void foo (void); -#define X 1 -#if defined X -#include "c1altinc1.h" -extern int var1; -extern int var2; -#else -#include "c1altinc1.h" -#endif -#endif Index: gcc/testsuite/g++.dg/pph/x0hardlookup.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0hardlookup.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0hardlookup.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1HARDLOOKUP_H -#define X1HARDLOOKUP_H +#ifndef X0HARDLOOKUP_H +#define X0HARDLOOKUP_H struct V { int a; static int b;}; namespace N { int V; Index: gcc/testsuite/g++.dg/pph/x1variables.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1variables.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1variables.h (working copy) @@ -1,6 +1,6 @@ #ifndef X1VARIABLES_H #define X1VARIABLES_H -#include "c1variables.h" +#include "c0variables.h" struct D { static int mbr_init_plain; static int mbr_uninit_plain; Index: gcc/testsuite/g++.dg/pph/x1special.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1special.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1special.cc (working copy) @@ -1,4 +1,4 @@ -#include "x1special.h" +#include "x0special.h" B b(1); Index: gcc/testsuite/g++.dg/pph/c1simple1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1simple1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1simple1.h (working copy) @@ -1,7 +0,0 @@ -#ifndef C1SIMPLE1_H -#define C1SIMPLE1_H - -#define assert(x) yellow(x) -extern void yellow(int); - -#endif Index: gcc/testsuite/g++.dg/pph/c3altinc.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c3altinc.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/c3altinc.cc (working copy) @@ -1,4 +1,4 @@ -#include "c1altinc2.h" +#include "c3altinc2.h" void foo (void) { int x = var1 + var2 - (int) f1; Index: gcc/testsuite/g++.dg/pph/c1chained1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1chained1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1chained1.h (working copy) @@ -1,4 +0,0 @@ -#ifndef C1CHAINED1_H -#define C1CHAINED1_H -#define ONE 1 -#endif Index: gcc/testsuite/g++.dg/pph/a1dynarray-use4b.cci =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-use4b.cci (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-use4b.cci (working copy) @@ -1,5 +0,0 @@ - int sum = 0; - for ( integer_array::reverse_iterator it = target.rbegin(); - it != target.rend(); - ++it ) - sum += *it; Index: gcc/testsuite/g++.dg/pph/x1overload3.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1overload3.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x1overload3.h (working copy) @@ -1,6 +1,6 @@ -#ifndef X2OVERLOAD3_H -#define X2OVERLOAD3_H -#include "x2overload1.h" +#ifndef X1OVERLOAD3_H +#define X1OVERLOAD3_H +#include "x0overload1.h" inline int f() { float x = 2.3f; Index: gcc/testsuite/g++.dg/pph/c4pr36533.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c4pr36533.cc (revision 0) +++ gcc/testsuite/g++.dg/pph/c4pr36533.cc (revision 0) @@ -0,0 +1,3 @@ +/* { dg-options "-w -fpermissive" } */ +// pph asm xdiff +#include "c4pr36533.h" Index: gcc/testsuite/g++.dg/pph/c1simple.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1simple.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1simple.cc (working copy) @@ -1,8 +0,0 @@ -/* comment */ - -#include "c1simple2.h" - -int main() -{ - return foo(); -} Index: gcc/testsuite/g++.dg/pph/c2builtin1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c2builtin1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2builtin1.h (working copy) @@ -1,5 +0,0 @@ -#ifndef C2BUILTIN1_H -#define C2BUILTIN1_H -#define QUOTE(arg) #arg -#define VALUE(arg) QUOTE(arg) -#endif Index: gcc/testsuite/g++.dg/pph/c1chained.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1chained.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1chained.cc (working copy) @@ -1,3 +1,3 @@ -#include "c1chained1.h" -#include "c1chained2.h" +#include "c0chained1.h" +#include "c0chained2.h" int x = TWO; Index: gcc/testsuite/g++.dg/pph/a2builtin4.h =================================================================== --- gcc/testsuite/g++.dg/pph/a2builtin4.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/a2builtin4.h (working copy) @@ -1,2 +0,0 @@ -#define QUOTE(arg) #arg -#define VALUE(arg) QUOTE(arg) Index: gcc/testsuite/g++.dg/pph/pph.map =================================================================== --- gcc/testsuite/g++.dg/pph/pph.map (revision 176187) +++ gcc/testsuite/g++.dg/pph/pph.map (working copy) @@ -1,67 +1,67 @@ -c120060625-1.h c120060625-1.pph -c1altinc1.h c1altinc1.pph -c1altinc2.h c1altinc2.pph -c1attr-warn-unused-result.h c1attr-warn-unused-result.pph -c1builtin-integral-1.h c1builtin-integral-1.pph -c1builtin-object-size-2.h c1builtin-object-size-2.pph -c1chained1.h c1chained1.pph -c1chained2.h c1chained2.pph +c0-20060625-1.h c0-20060625-1.pph +c0altinc1.h c0altinc1.pph +c3altinc2.h c3altinc2.pph +c0attr-warn-unused.h c0attr-warn-unused.pph +c0builtin-integral.h c0builtin-integral.pph +c0builtin-objsize.h c0builtin-objsize.pph +c0chained1.h c0chained1.pph +c0chained2.h c0chained2.pph c1eabi1.h c1eabi1.pph -c1empty.h c1empty.pph -c1field.h c1field.pph -c1funcmac.h c1funcmac.pph -c1funcstatic.h c1funcstatic.pph -c1functions.h c1functions.pph -c1guarded1.h c1guarded1.pph +c0empty.h c0empty.pph +c0field.h c0field.pph +c0funcmac.h c0funcmac.pph +c0funcstatic.h c0funcstatic.pph +c0functions.h c0functions.pph +c0guarded1.h c0guarded1.pph c1guarded2.h c1guarded2.pph c1guarded3.h c1guarded3.pph -c1limits-externalid.h c1limits-externalid.pph -c1meteor-contest.h c1meteor-contest.pph -c1multinc1.h c1multinc1.pph +c0limits-externalid.h c0limits-externalid.pph +c0meteor-contest.h c0meteor-contest.pph +c0multinc1.h c0multinc1.pph c1multinc2.h c1multinc2.pph c1pr36533.h c1pr36533.pph -c1pr44948-1a.h c1pr44948-1a.pph -c1return-5.h c1return-5.pph -c1simple1.h c1simple1.pph +c0pr44948-1a.h c0pr44948-1a.pph +c0return-5.h c0return-5.pph +c0simple1.h c0simple1.pph c1simple2.h c1simple2.pph -c1struct.h c1struct.pph -c1typerefs.h c1typerefs.pph -c1variables.h c1variables.pph -c1varorder.h c1varorder.pph -c2builtin1.h c2builtin1.pph -c2builtin2.h c2builtin2.pph -c2builtin3.h c2builtin3.pph -c2builtin5.h c2builtin5.pph -c2builtin6.h c2builtin6.pph -c2dupguard1.h c2dupguard1.pph -c2dupguard2.h c2dupguard2.pph -c2eabi1.h c2eabi1.pph -c2meteor-contest.h c2meteor-contest.pph -c2paste.h c2paste.pph -d1symnotinc.h d1symnotinc.pph +c0struct.h c0struct.pph +c0typerefs.h c0typerefs.pph +c0variables.h c0variables.pph +c0varorder.h c0varorder.pph +c0builtin1.h c0builtin1.pph +c1builtin2.h c1builtin2.pph +c1builtin3.h c1builtin3.pph +c0builtin5.h c0builtin5.pph +c0builtin6.h c0builtin6.pph +c0dupguard1.h c0dupguard1.pph +c0dupguard2.h c0dupguard2.pph +c4eabi1.h c4eabi1.pph +c4meteor-contest.h c4meteor-contest.pph +c0paste.h c0paste.pph +d0symnotinc.h d0symnotinc.pph math.h math.pph stdio.h stdio.pph stdlib.h stdlib.pph string.h string.pph sys/types.h types.pph -x1autometh.h x1autometh.pph -x1dynarray1.h x1dynarray1.pph +x0autometh.h x0autometh.pph +x0dynarray1.h x0dynarray1.pph x1funcstatic.h x1funcstatic.pph x1functions.h x1functions.pph -x1globalref.h x1globalref.pph -x1hardlookup.h x1hardlookup.pph -x1namespace.h x1namespace.pph -x1special.h x1special.pph -x1struct0.h x1struct0.pph +x0globalref.h x0globalref.pph +x0hardlookup.h x0hardlookup.pph +x0namespace.h x0namespace.pph +x0special.h x0special.pph +x0struct0.h x0struct0.pph x1struct1.h x1struct1.pph x1struct2.h x1struct2.pph -x1template.h x1template.pph -x1ten-hellos.h x1ten-hellos.pph -x1tmplclass.h x1tmplclass.pph -x1tmplfunc.h x1tmplfunc.pph +x0template.h x0template.pph +x0ten-hellos.h x0ten-hellos.pph +x0tmplclass.h x0tmplclass.pph +x0tmplfunc.h x0tmplfunc.pph x1typerefs.h x1typerefs.pph x1variables.h x1variables.pph -x2nontrivinit.h x2nontrivinit.pph -x2overload1.h x2overload1.pph -x2overload2.h x2overload2.pph -x2overload3.h x2overload3.pph +x0nontrivinit.h x0nontrivinit.pph +x0overload1.h x0overload1.pph +x0overload2.h x0overload2.pph +x1overload3.h x1overload3.pph Index: gcc/testsuite/g++.dg/pph/x1struct1.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1struct1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1struct1.h (working copy) @@ -1,6 +1,6 @@ #ifndef X1STRUCT1_H #define X1STRUCT1_H -#include "x1struct0.h" +#include "x0struct0.h" struct D : public thing { type method(); type another() Index: gcc/testsuite/g++.dg/pph/c0multinc1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0multinc1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0multinc1.h (working copy) @@ -1,4 +1,4 @@ -#ifndef C1MULTINC1_H -#define C1MULTINC1_H +#ifndef C0MULTINC1_H +#define C0MULTINC1_H extern float f1; #endif Index: gcc/testsuite/g++.dg/pph/c1guarded1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1guarded1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1guarded1.h (working copy) @@ -1,4 +0,0 @@ -#ifndef C1GUARDED1_H -#define C1GUARDED1_H -typedef int type; -#endif Index: gcc/testsuite/g++.dg/pph/c0limits-externalid.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0limits-externalid.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0limits-externalid.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H +#ifndef C0LIMITS_EXTERNALID_H +#define C0LIMITS_EXTERNALID_H #define LIM1(x) x##0; x##1; x##2; x##3; x##4; x##5; x##6; x##7; x##8; x##9; #define LIM2(x) LIM1(x##0) LIM1(x##1) LIM1(x##2) LIM1(x##3) LIM1(x##4) \ LIM1(x##5) LIM1(x##6) LIM1(x##7) LIM1(x##8) LIM1(x##9) Index: gcc/testsuite/g++.dg/pph/x1template.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1template.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1template.cc (working copy) @@ -1,4 +1,4 @@ -#include "x1template.h" +#include "x0template.h" int x = 3; Index: gcc/testsuite/g++.dg/pph/c3multinc2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c3multinc2.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c3multinc2.h (working copy) @@ -1,8 +1,8 @@ -#ifndef C1MULTINC2 -#define C1MULTINC2 -#include "c1altinc1.h" +#ifndef C3MULTINC2 +#define C3MULTINC2 +#include "c0multinc1.h" extern void foo (void); extern int var1; extern int var2; -#include "c1altinc1.h" +#include "c0multinc1.h" #endif Index: gcc/testsuite/g++.dg/pph/a1dynarray-hlp1.cci =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-hlp1.cci (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-hlp1.cci (working copy) @@ -1,12 +0,0 @@ -integer& operator<<(std::ostream& os, integer iv) -{ - os << (int)iv; -} - -void dump( const integer_array& source ) -{ - integer_array::const_iterator it = source.cbegin(); - for ( ; it != source.end(); ++it ) - std::cout << " " << *it; - std::cout << std::endl; -} Index: gcc/testsuite/g++.dg/pph/x1dynarray3.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray3.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray3.h (working copy) @@ -1,23 +0,0 @@ -#ifndef X1DYNARRAY3_H -#define X1DYNARRAY3_H - -#include <stddef.h> -#include <new> - -namespace tst { - -template< typename T > -struct dynarray -{ - #include "a1dynarray-dcl1.hi" - #include "a1dynarray-dcl2b.hi" - #include "a1dynarray-dcl3.hi" -}; - -#include "a1dynarray-dfn1b.hi" -#include "a1dynarray-dfn2b.hi" -#include "a1dynarray-dfn3b.hi" - -} // namespace tst - -#endif Index: gcc/testsuite/g++.dg/pph/x1dynarray5.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray5.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray5.cc (working copy) @@ -1,29 +0,0 @@ -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } -// { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } - -#include "x1dynarray4.h" -#include "x1dynarray5.h" - -#include <algorithm> -#include <iostream> - -#include "a1integer.h" -typedef tst::dynarray< integer > integer_array; - -#include "a1dynarray-hlp1.cci" - -int main() -{ - #include "a1dynarray-use1.cci" - dump( source ); - dump( sorted ); - std::sort( sorted.begin(), sorted.end() ); - dump( sorted ); - #include "a1dynarray-use2.cci" - dump( target ); - #include "a1dynarray-use3a.cci" - #include "a1dynarray-use4a.cci" - return sum - 23; -} Index: gcc/testsuite/g++.dg/pph/c120060625-1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c120060625-1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c120060625-1.h (working copy) @@ -1,15 +0,0 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H - -/* PR middle-end/28151 */ -/* Testcase by Steven Bosscher <stevenb.gcc@gmail.com> */ - -_Complex float b; - -void foo (void) -{ - _Complex float a = __FLT_MAX__; - b = __FLT_MAX__ + a; -} -#endif - Index: gcc/testsuite/g++.dg/pph/y9overload.cc =================================================================== --- gcc/testsuite/g++.dg/pph/y9overload.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/y9overload.cc (working copy) @@ -1,6 +1,6 @@ -#include "x2overload1.h" -#include "x2overload2.h" -#include "x2overload3.h" +#include "x0overload1.h" +#include "x0overload2.h" +#include "x1overload3.h" // { dg-error "inconsistent overload resolution" "" { xfail *-*-* } } int g() Index: gcc/testsuite/g++.dg/pph/c1guarded.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1guarded.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1guarded.cc (working copy) @@ -1,2 +0,0 @@ -#include "c1guarded2.h" -#include "c1guarded3.h" Index: gcc/testsuite/g++.dg/pph/c2paste.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c2paste.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2paste.cc (working copy) @@ -1,6 +0,0 @@ -#include "c2paste.h" -void foo_30_(int); -void bar(void) -{ - M(30); -} Index: gcc/testsuite/g++.dg/pph/x1tmplfunc.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1tmplfunc.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1tmplfunc.h (working copy) @@ -1,9 +0,0 @@ -#ifndef X1TMPLFUNC_H -#define X1TMPLFUNC_H -typedef int type; -extern type val; - -template< typename T > -T identity(T arg) -{ return arg + val; } -#endif Index: gcc/testsuite/g++.dg/pph/c1return-5.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1return-5.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1return-5.cc (working copy) @@ -1,4 +1,4 @@ // { dg-options "-mpreferred-stack-boundary=4" } // { dg-final { scan-assembler-not "and\[lq\]?\[^\\n\]*-64,\[^\\n\]*sp" } } -#include "c1return-5.h" +#include "c0return-5.h" Index: gcc/testsuite/g++.dg/pph/x0overload1.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0overload1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0overload1.h (working copy) @@ -1,4 +1,4 @@ -#ifndef X2OVERLOAD1_H -#define X2OVERLOAD1_H +#ifndef X0OVERLOAD1_H +#define X0OVERLOAD1_H int o(double x); #endif Index: gcc/testsuite/g++.dg/pph/d8dupguard.cc =================================================================== --- gcc/testsuite/g++.dg/pph/d8dupguard.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/d8dupguard.cc (working copy) @@ -1,3 +1,3 @@ -#include "c2dupguard1.h" -#include "c2dupguard2.h" // { dg-error "fails macro validation" "" { xfail *-*-* } } +#include "c0dupguard1.h" +#include "c0dupguard2.h" // { dg-error "fails macro validation" "" { xfail *-*-* } } int foo() { return x; } Index: gcc/testsuite/g++.dg/pph/a1dynarray-dcl3.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dcl3.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dcl3.hi (working copy) @@ -1,49 +0,0 @@ -private: - - // fields: - T* store; - size_type count; - - // helper functions: - void check(size_type n); - - T* alloc(size_type n) - { return reinterpret_cast<T*>( new char[ n*sizeof(T) ] ); } - -public: - // construct and destruct: - dynarray(); // undefined - const dynarray operator=(const dynarray&); // undefined - - explicit dynarray(size_type c); - dynarray(const dynarray& d); - ~dynarray(); - - // capacity: - size_type size() const { return count; } - size_type max_size() const { return count; } - bool empty() const { return false; } - - // element access: - reference operator[](size_type n) { return store[n]; } - const_reference operator[](size_type n) const { return store[n]; } - - reference front() { return store[0]; } - const_reference front() const { return store[0]; } - reference back() { return store[count-1]; } - const_reference back() const { return store[count-1]; } - - const_reference at(size_type n) const { check(n); return store[n]; } - reference at(size_type n) { check(n); return store[n]; } - - // data access: - T* data() { return store; } - const T* data() const { return store; } - - // iterators: - iterator begin() { return store; } - const_iterator begin() const { return store; } - const_iterator cbegin() const { return store; } - iterator end() { return store + count; } - const_iterator end() const { return store + count; } - const_iterator cend() const { return store + count; } Index: gcc/testsuite/g++.dg/pph/c1struct.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1struct.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1struct.h (working copy) @@ -1,9 +0,0 @@ -#ifndef C1STRUCT_H -#define C1STRUCT_H -typedef int type; -type gbl = 1; -struct B { - type fld; -}; -typedef B thing; -#endif Index: gcc/testsuite/g++.dg/pph/x1funcstatic.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1funcstatic.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1funcstatic.cc (working copy) @@ -1,2 +1,2 @@ -#include "c1funcstatic.h" +#include "c0funcstatic.h" int a = f(); Index: gcc/testsuite/g++.dg/pph/c2builtin1.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c2builtin1.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2builtin1.cc (working copy) @@ -1,3 +0,0 @@ -#include "c2builtin1.h" -#include "c2builtin2.h" -#include "c2builtin3.h" Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn2b.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn2b.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn2b.hi (working copy) @@ -1,15 +0,0 @@ -template< typename T > -dynarray<T>::dynarray(const dynarray& d) -: store( alloc( d.count ) ), count( d.count ) -{ - size_type i; - try { - for ( size_type i = 0; i < count; ++i ) - new (store+i) T(d.store[i]); - } - catch ( ... ) { - for ( ; i > 0; --i ) - (store+(i-1))->~T(); - delete store; throw; - } -} Index: gcc/testsuite/g++.dg/pph/a1integer.h =================================================================== --- gcc/testsuite/g++.dg/pph/a1integer.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1integer.h (working copy) @@ -1,22 +0,0 @@ -#ifndef A1INTEGER_H -#define A1INTEGER_H - -class integer -{ - int value; -public: - integer() - : value(0) { } - integer( int v ) - : value(v) { } - integer( const integer& other ) - : value( other.value ) { } - integer& operator=( const integer& other ) - { value = other.value; return *this; } - operator int() const - { return value; } - bool operator <( const integer& other ) const - { return value < other.value; } -}; - -#endif Index: gcc/testsuite/g++.dg/pph/x1hardlookup.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1hardlookup.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1hardlookup.cc (working copy) @@ -1,6 +1,6 @@ // pph asm xdiff -#include "x1hardlookup.h" +#include "x0hardlookup.h" D P; Index: gcc/testsuite/g++.dg/pph/c1empty.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1empty.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1empty.cc (working copy) @@ -1 +1 @@ -#include "c1empty.h" +#include "c0empty.h" Index: gcc/testsuite/g++.dg/pph/c3altinc2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c3altinc2.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c3altinc2.h (working copy) @@ -1,12 +1,12 @@ -#ifndef C1ALTINC2 -#define C1ALTINC2 +#ifndef C3ALTINC2 +#define C3ALTINC2 extern void foo (void); #define X 1 #if defined X -#include "c1altinc1.h" +#include "c0altinc1.h" extern int var1; extern int var2; #else -#include "c1altinc1.h" +#include "c0altinc1.h" #endif #endif Index: gcc/testsuite/g++.dg/pph/x0dynarray1.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0dynarray1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0dynarray1.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1DYNARRAY1_H -#define X1DYNARRAY1_H +#ifndef X0DYNARRAY1_H +#define X0DYNARRAY1_H extern "C" void *memcpy(void *dest, const void *src, unsigned long n); extern "C" void exit(int) throw(); @@ -7,13 +7,13 @@ extern "C" void exit(int) throw(); template< typename T > struct dynarray { - #include "a1dynarray-dcl1.hi" - #include "a1dynarray-dcl2a.hi" - #include "a1dynarray-dcl3.hi" + #include "a0dynarray-dcl1.hi" + #include "a0dynarray-dcl2a.hi" + #include "a0dynarray-dcl3.hi" }; -#include "a1dynarray-dfn1a.hi" -#include "a1dynarray-dfn2a.hi" -#include "a1dynarray-dfn3a.hi" +#include "a0dynarray-dfn1a.hi" +#include "a0dynarray-dfn2a.hi" +#include "a0dynarray-dfn3a.hi" #endif Index: gcc/testsuite/g++.dg/pph/c1builtin-integral-1.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1builtin-integral-1.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1builtin-integral-1.cc (working copy) @@ -1,2 +0,0 @@ -// pph asm xdiff -#include "c1builtin-integral-1.h" Index: gcc/testsuite/g++.dg/pph/x1special.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1special.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1special.h (working copy) @@ -1,21 +0,0 @@ -#ifndef X1SPECIAL_H -#define X1SPECIAL_H - -struct B { - B( int ); - B( double ); - B( const B& ); - B& operator=( const B& ); - B& operator=( int ); - operator double(); - ~B(); -}; - -struct D { - D( const B& ); -}; - -int F( D ); -int G( double ); - -#endif Index: gcc/testsuite/g++.dg/pph/c1builtin-integral-1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1builtin-integral-1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1builtin-integral-1.h (working copy) @@ -1,71 +0,0 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H -/* Copyright (C) 2004 Free Software Foundation. - - Verify that integral FP expressions are optimized. - - Written by Kaveh Ghazi, 2004-03-16. */ - -/* We need -ffinite-math-only so that we can fold "foo != foo", where - foo is a floating point expression. We need -fno-math-errno so - that various math functions are marked const/pure and can be - folded. */ -/* { dg-options "-ffinite-math-only -fno-math-errno" } */ - -extern int link_failure (int); - -/* Test that the various FP truncation builtins detect integral - arguments. */ -#define CHECK_FN(MATHFN) \ - if (__builtin_##MATHFN(i1) != i1) link_failure (__LINE__); \ - if (__builtin_##MATHFN##f(i1) != i1) link_failure (__LINE__); \ - if (__builtin_##MATHFN##l(i1) != i1) link_failure (__LINE__); - -#define CHECK_FN_RET(MATHFN, RET) \ - if (__builtin_##MATHFN(i1) != (RET)(double)i1) link_failure (__LINE__); \ - if (__builtin_##MATHFN##f(i1) != (RET)(float)i1) link_failure (__LINE__); \ - if (__builtin_##MATHFN##l(i1) != (RET)(long double)i1) link_failure (__LINE__); - - /* Check that various other integral expressions are detected. */ -#define CHECK_EXPR(EXPR,NAME) \ - if (__builtin_ceill(EXPR) != (EXPR)) link_failure (__LINE__); \ - if (__builtin_lroundl(EXPR) != (long)(long double)(EXPR)) link_failure (__LINE__); - -void __attribute__ ((__noinline__)) test (int i1, int i2) -{ - CHECK_FN(ceil); - CHECK_FN(floor); - CHECK_FN(nearbyint); - CHECK_FN(rint); - CHECK_FN(round); - CHECK_FN(trunc); - CHECK_FN_RET(lround, long); - CHECK_FN_RET(llround, long long); - CHECK_FN_RET(lrint, long); - CHECK_FN_RET(llrint, long long); - CHECK_FN_RET(lceil, long); - CHECK_FN_RET(llceil, long long); - CHECK_FN_RET(lfloor, long); - CHECK_FN_RET(llfloor, long long); - - CHECK_EXPR (5.0, REAL_CST); - CHECK_EXPR (5.0F, REAL_CSTf); - CHECK_EXPR (5.0L, REAL_CSTl); - CHECK_EXPR ((double)i1, FLOAT_EXPR); - CHECK_EXPR ((float)i1, FLOAT_EXPRf); - CHECK_EXPR ((long double)i1, FLOAT_EXPRl); - CHECK_EXPR (__builtin_fabs(i1), ABS_EXPR); - CHECK_EXPR (__builtin_fabsf(i1), ABS_EXPRf); - CHECK_EXPR (__builtin_fabsl(i1), ABS_EXPRl); - CHECK_EXPR (((void)i1,(double)i2), COMPOUND_EXPR); - CHECK_EXPR ((double)i1+i2, PLUS_EXPR); - CHECK_EXPR ((double)i1-i2, MINUS_EXPR); - CHECK_EXPR ((double)i1*i2, MULT_EXPR); -} - -int main (void) -{ - test (1, 2); - return 0; -} -#endif Index: gcc/testsuite/g++.dg/pph/c1simple2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1simple2.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1simple2.h (working copy) @@ -1,7 +1,7 @@ #ifndef C1SIMPLE2_H #define C1SIMPLE2_H -#include "c1simple1.h" +#include "c0simple1.h" inline int foo() { Index: gcc/testsuite/g++.dg/pph/c1chained2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1chained2.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1chained2.h (working copy) @@ -1,4 +0,0 @@ -#ifndef C1CHAINED2_H -#define C1CHAINED2_H -#define TWO ONE -#endif Index: gcc/testsuite/g++.dg/pph/c1attr-warn-unused.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1attr-warn-unused.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/c1attr-warn-unused.cc (working copy) @@ -1,3 +1,3 @@ /* { dg-options "-w" } */ // pph asm xdiff -#include "c1attr-warn-unused-result.h" +#include "c0attr-warn-unused.h" Index: gcc/testsuite/g++.dg/pph/c1eabi1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1eabi1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1eabi1.h (working copy) @@ -1,167 +0,0 @@ -// { dg-options "-w -fpermissive" } -// FIXME pph - Enabling PPH for this file causes memory problems in cc1plus. -// c1eabi1.h c1eabi1.pph - -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H - -/* This file tests most of the non-C++ run-time helper functions - described in Section 4 of the "Run-Time ABI for the ARM - Architecture". These are basic tests; they do not try to validate - all of the corner cases in these routines. - - The functions not tested here are: - - __aeabi_cdcmpeq - __aeabi_cdcmple - __aeabi_cdrcmple - __aeabi_cfcmpeq - __aeabi_cfcmple - __aeabi_cfrcmple - __aeabi_ldivmod - __aeabi_uldivmod - __aeabi_idivmod - __aeabi_uidivmod - - These functions have non-standard calling conventions that would - require the use of inline assembly to test. It would be good to - add such tests, but they have not yet been implemented. - - There are also no tests for the "division by zero", "memory copying, - clearing, and setting" functions. */ - -/* Simplified version of c2eabi1.cc - Do not include other system - headers here. Simply forward declare the library functions used - by this header. */ -extern "C" { - extern void abort(void); - extern int abs(int); - extern void exit(int); - extern double fabs(double); - extern int printf(const char *, ...); -} - -/* All these functions are defined to use the base ABI, so use the - attribute to ensure the tests use the base ABI to call them even - when the VFP ABI is otherwise in effect. */ -#define PCS __attribute__((pcs("aapcs"))) - -#define decl_float(code, type) \ - extern type __aeabi_ ## code ## add (type, type) PCS; \ - extern type __aeabi_ ## code ## div (type, type) PCS; \ - extern type __aeabi_ ## code ## mul (type, type) PCS; \ - extern type __aeabi_ ## code ## neg (type) PCS; \ - extern type __aeabi_ ## code ## rsub (type, type) PCS; \ - extern type __aeabi_ ## code ## sub (type, type) PCS; \ - extern int __aeabi_ ## code ## cmpeq (type, type) PCS; \ - extern int __aeabi_ ## code ## cmplt (type, type) PCS; \ - extern int __aeabi_ ## code ## cmple (type, type) PCS; \ - extern int __aeabi_ ## code ## cmpge (type, type) PCS; \ - extern int __aeabi_ ## code ## cmpgt (type, type) PCS; \ - extern int __aeabi_ ## code ## cmpun (type, type) PCS; \ - extern int __aeabi_ ## code ## 2iz (type) PCS; \ - extern unsigned int __aeabi_ ## code ## 2uiz (type) PCS; \ - extern long long __aeabi_ ## code ## 2lz (type) PCS; \ - extern unsigned long long __aeabi_ ## code ## 2ulz (type) PCS; \ - extern type __aeabi_i2 ## code (int) PCS; \ - extern type __aeabi_ui2 ## code (int) PCS; \ - extern type __aeabi_l2 ## code (long long) PCS; \ - extern type __aeabi_ul2 ## code (unsigned long long) PCS; \ - \ - type code ## zero = 0.0; \ - type code ## one = 1.0; \ - type code ## two = 2.0; \ - type code ## four = 4.0; \ - type code ## minus_one = -1.0; \ - type code ## minus_two = -2.0; \ - type code ## minus_four = -4.0; \ - type code ## epsilon = 1E-32; \ - type code ## NaN = 0.0 / 0.0; - -decl_float (d, double) -decl_float (f, float) - -extern float __aeabi_d2f (double) PCS; -extern double __aeabi_f2d (float) PCS; -extern long long __aeabi_lmul (long long, long long); -extern long long __aeabi_llsl (long long, int); -extern long long __aeabi_llsr (long long, int); -extern long long __aeabi_lasr (long long, int); -extern int __aeabi_lcmp (long long, long long); -extern int __aeabi_ulcmp (unsigned long long, unsigned long long); -extern int __aeabi_idiv (int, int); -extern unsigned int __aeabi_uidiv (unsigned int, unsigned int); -extern int __aeabi_uread4 (void *); -extern int __aeabi_uwrite4 (int, void *); -extern long long __aeabi_uread8 (void *); -extern long long __aeabi_uwrite8 (long long, void *); - -#define eq(a, b, type, abs, epsilon, format) \ - { \ - type a1; \ - type b1; \ - \ - a1 = a; \ - b1 = b; \ - if (abs (a1 - b1) > epsilon) \ - { \ - printf ("%d: Test %s == %s\n", __LINE__, #a, #b); \ - printf ("%d: " format " != " format "\n", \ - __LINE__, a1, b1); \ - abort (); \ - } \ - } - -#define ieq(a, b) eq (a, b, int, abs, 0, "%d") -#define ueq(a, b) eq (a, b, unsigned int, abs, 0, "%u") -#define leq(a, b) eq (a, b, long long, abs, 0, "%lld") -#define uleq(a, b) eq (a, b, unsigned long long, abs, 0, "%llu") -#define feq(a, b) eq (a, b, float, fabs, fepsilon, "%f") -#define deq(a, b) eq (a, b, double, fabs, depsilon, "%g") - -#define NUM_CMP_VALUES 6 - -/* Values picked to cover a range of small, large, positive and negative. */ -static unsigned int cmp_val[NUM_CMP_VALUES] = -{ - 0, - 1, - 0x40000000, - 0x80000000, - 0xc0000000, - 0xffffffff -}; - -/* All combinations for each of the above values. */ -#define ulcmp(l, s, m) \ - s, l, l, l, l, l, m, s, l, l, l, l, \ - m, m, s, l, l, l, m, m, m, s, l, l, \ - m, m, m, m, s, l, m, m, m, m, m, s - -#define lcmp(l, s, m) \ - s, l, l, m, m, m, m, s, l, m, m, m, \ - m, m, s, m, m, m, l, l, l, s, l, l, \ - l, l, l, m, s, l, l, l, l, m, m, s - -/* All combinations of the above for high/low words. */ -static int lcmp_results[] = -{ - lcmp(ulcmp(-1, -1, -1), ulcmp(-1, 0, 1), ulcmp(1, 1, 1)) -}; - -static int ulcmp_results[] = -{ - ulcmp(ulcmp(-1, -1, -1), ulcmp(-1, 0, 1), ulcmp(1, 1, 1)) -}; - -static int signof(int i) -{ - if (i < 0) - return -1; - - if (i == 0) - return 0; - - return 1; -} -#endif Index: gcc/testsuite/g++.dg/pph/c1pr36533.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1pr36533.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1pr36533.cc (working copy) @@ -1,3 +0,0 @@ -/* { dg-options "-w -fpermissive" } */ -// pph asm xdiff -#include "c1pr36533.h" Index: gcc/testsuite/g++.dg/pph/a1dynarray-dcl2a.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dcl2a.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dcl2a.hi (working copy) @@ -1,3 +0,0 @@ - // system-based types: - typedef unsigned long size_type; - typedef long difference_type; Index: gcc/testsuite/g++.dg/pph/d1symnotinc.h =================================================================== --- gcc/testsuite/g++.dg/pph/d1symnotinc.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/d1symnotinc.h (working copy) @@ -1,5 +0,0 @@ -#ifndef D1SDYMNOTINC_H -#define D1SDYMNOTINC_H -struct T { int f; }; -struct T NAME = { VALUE }; // { dg-error "was not declared in this scope" } -#endif Index: gcc/testsuite/g++.dg/pph/c2builtin2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c2builtin2.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2builtin2.h (working copy) @@ -1,9 +0,0 @@ -#ifndef C2BUILTIN2_H -#define C2BUILTIN2_H -#include "c2builtin1.h" -const char *file = VALUE(__FILE__); -const char *line = VALUE(__LINE__); -const char *vers = VALUE(__cplusplus); -const char *optm = VALUE(__OPTIMIZE__); -const char *func() { return __func__; } -#endif Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn3a.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn3a.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn3a.hi (working copy) @@ -1,3 +0,0 @@ -template< typename T > -void dynarray<T>::check(size_type n) -{ if ( n >= count ) exit(1); } Index: gcc/testsuite/g++.dg/pph/x1struct2.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1struct2.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1struct2.h (working copy) @@ -1,6 +1,6 @@ #ifndef X1STRUCT_H #define X1STRUCT_H -#include "c1struct.h" +#include "c0struct.h" struct D : thing { type method(); type another() Index: gcc/testsuite/g++.dg/pph/c2dupguard1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c2dupguard1.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2dupguard1.h (working copy) @@ -1,4 +0,0 @@ -#ifndef C2DUPGUARD_H -#define C2DUPGUARD_H -extern int x; -#endif Index: gcc/testsuite/g++.dg/pph/x1ten-hellos.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1ten-hellos.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1ten-hellos.cc (working copy) @@ -1,6 +1,6 @@ // { dg-do run } -#include "x1ten-hellos.h" +#include "x0ten-hellos.h" int main(void) { Index: gcc/testsuite/g++.dg/pph/c1guarded2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1guarded2.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1guarded2.h (working copy) @@ -1,5 +1,5 @@ #ifndef C1GUARDED2_H #define C1GUARDED2_H -#include "c1guarded1.h" +#include "c0guarded1.h" type variable2; #endif Index: gcc/testsuite/g++.dg/pph/x1dynarray2a.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray2a.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray2a.cc (working copy) @@ -1,6 +1,6 @@ // { dg-do run } -#include "x1dynarray2.h" +#include "x0dynarray2.h" typedef int integer; using namespace tst; @@ -8,8 +8,8 @@ typedef dynarray< integer > integer_arra int main() { - #include "a1dynarray-use1.cci" - #include "a1dynarray-use2.cci" - #include "a1dynarray-use4a.cci" + #include "a0dynarray-use1.cci" + #include "a0dynarray-use2.cci" + #include "a0dynarray-use4a.cci" return sum - 25; } Index: gcc/testsuite/g++.dg/pph/x1dynarray4.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray4.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray4.h (working copy) @@ -1,18 +0,0 @@ -#ifndef X1DYNARRAY4_H -#define X1DYNARRAY4_H - -#include <stddef.h> - -namespace tst { - -template< typename T > -struct dynarray -{ - #include "a1dynarray-dcl1.hi" - #include "a1dynarray-dcl2b.hi" - #include "a1dynarray-dcl3.hi" -}; - -} // namespace tst - -#endif Index: gcc/testsuite/g++.dg/pph/c0funcstatic.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0funcstatic.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0funcstatic.h (working copy) @@ -1,5 +1,5 @@ -#ifndef C1FUNCSTATIC_H -#define C1FUNCSTATIC_H +#ifndef C0FUNCSTATIC_H +#define C0FUNCSTATIC_H static int f() { static int x = 3; return x++; Index: gcc/testsuite/g++.dg/pph/c0meteor-contest.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0meteor-contest.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0meteor-contest.h (working copy) @@ -1,6 +1,6 @@ /* { dg-options "-w" } */ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H +#ifndef C0METEOR_CONTEST_H +#define C0METEOR_CONTEST_H /* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -36,9 +36,9 @@ POSSIBILITY OF SUCH DAMAGE. * contributed by Christian Vosteen */ -/* Simplified version of c2meteor-contest.h - Do not include other system - headers here. Simply forward declare the library functions used - by this header. */ +/* Simplified version of c4meteor-contest.h + - Do not include other system headers here. + Simply forward declare the library functions used by this header. */ extern "C" { typedef __SIZE_TYPE__ size_t; void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); Index: gcc/testsuite/g++.dg/pph/c1variables.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1variables.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1variables.h (working copy) @@ -1,7 +0,0 @@ -#ifndef C1VARIABLES_H -#define C1VARIABLES_H -extern int gbl_init_extern; -extern int gbl_uninit_extern; -int gbl_tentative; -extern const int gbl_extern_const; -#endif Index: gcc/testsuite/g++.dg/pph/c1meteor-contest.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1meteor-contest.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1meteor-contest.h (working copy) @@ -1,625 +0,0 @@ -/* { dg-options "-w" } */ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H -/* -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of "The Computer Language Benchmarks Game" nor the - name of "The Computer Language Shootout Benchmarks" nor the names of - its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. -*/ - -/* The Computer Language Benchmarks Game - * http://shootout.alioth.debian.org/ - * - * contributed by Christian Vosteen - */ - -/* Simplified version of c2meteor-contest.h - Do not include other system - headers here. Simply forward declare the library functions used - by this header. */ -extern "C" { - typedef __SIZE_TYPE__ size_t; - void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); - int printf(const char *, ...); - int atoi(const char *); -} - -#define TRUE 1 -#define FALSE 0 - -/* The board is a 50 cell hexagonal pattern. For . . . . . - * maximum speed the board will be implemented as . . . . . - * 50 bits, which will fit into a 64 bit long long . . . . . - * int. . . . . . - * . . . . . - * I will represent 0's as empty cells and 1's . . . . . - * as full cells. . . . . . - * . . . . . - * . . . . . - * . . . . . - */ - -unsigned long long board = 0xFFFC000000000000ULL; - -/* The puzzle pieces must be specified by the path followed - * from one end to the other along 12 hexagonal directions. - * - * Piece 0 Piece 1 Piece 2 Piece 3 Piece 4 - * - * O O O O O O O O O O O O O O O - * O O O O O O O - * O O O - * - * Piece 5 Piece 6 Piece 7 Piece 8 Piece 9 - * - * O O O O O O O O O O O O O - * O O O O O O O O O - * O O O - * - * I had to make it 12 directions because I wanted all of the - * piece definitions to fit into the same size arrays. It is - * not possible to define piece 4 in terms of the 6 cardinal - * directions in 4 moves. - */ - -#define E 0 -#define ESE 1 -#define SE 2 -#define S 3 -#define SW 4 -#define WSW 5 -#define W 6 -#define WNW 7 -#define NW 8 -#define N 9 -#define NE 10 -#define ENE 11 -#define PIVOT 12 - -char piece_def[10][4] = { - { E, E, E, SE}, - { SE, E, NE, E}, - { E, E, SE, SW}, - { E, E, SW, SE}, - { SE, E, NE, S}, - { E, E, SW, E}, - { E, SE, SE, NE}, - { E, SE, SE, W}, - { E, SE, E, E}, - { E, E, E, SW} -}; - - -/* To minimize the amount of work done in the recursive solve function below, - * I'm going to allocate enough space for all legal rotations of each piece - * at each position on the board. That's 10 pieces x 50 board positions x - * 12 rotations. However, not all 12 rotations will fit on every cell, so - * I'll have to keep count of the actual number that do. - * The pieces are going to be unsigned long long ints just like the board so - * they can be bitwise-anded with the board to determine if they fit. - * I'm also going to record the next possible open cell for each piece and - * location to reduce the burden on the solve function. - */ -unsigned long long pieces[10][50][12]; -int piece_counts[10][50]; -char next_cell[10][50][12]; - -/* Returns the direction rotated 60 degrees clockwise */ -char rotate(char dir) { - return (dir + 2) % PIVOT; -} - -/* Returns the direction flipped on the horizontal axis */ -char flip(char dir) { - return (PIVOT - dir) % PIVOT; -} - - -/* Returns the new cell index from the specified cell in the - * specified direction. The index is only valid if the - * starting cell and direction have been checked by the - * out_of_bounds function first. - */ -char shift(char cell, char dir) { - switch(dir) { - case E: - return cell + 1; - case ESE: - if((cell / 5) % 2) - return cell + 7; - else - return cell + 6; - case SE: - if((cell / 5) % 2) - return cell + 6; - else - return cell + 5; - case S: - return cell + 10; - case SW: - if((cell / 5) % 2) - return cell + 5; - else - return cell + 4; - case WSW: - if((cell / 5) % 2) - return cell + 4; - else - return cell + 3; - case W: - return cell - 1; - case WNW: - if((cell / 5) % 2) - return cell - 6; - else - return cell - 7; - case NW: - if((cell / 5) % 2) - return cell - 5; - else - return cell - 6; - case N: - return cell - 10; - case NE: - if((cell / 5) % 2) - return cell - 4; - else - return cell - 5; - case ENE: - if((cell / 5) % 2) - return cell - 3; - else - return cell - 4; - default: - return cell; - } -} - -/* Returns wether the specified cell and direction will land outside - * of the board. Used to determine if a piece is at a legal board - * location or not. - */ -char out_of_bounds(char cell, char dir) { - char i; - switch(dir) { - case E: - return cell % 5 == 4; - case ESE: - i = cell % 10; - return i == 4 || i == 8 || i == 9 || cell >= 45; - case SE: - return cell % 10 == 9 || cell >= 45; - case S: - return cell >= 40; - case SW: - return cell % 10 == 0 || cell >= 45; - case WSW: - i = cell % 10; - return i == 0 || i == 1 || i == 5 || cell >= 45; - case W: - return cell % 5 == 0; - case WNW: - i = cell % 10; - return i == 0 || i == 1 || i == 5 || cell < 5; - case NW: - return cell % 10 == 0 || cell < 5; - case N: - return cell < 10; - case NE: - return cell % 10 == 9 || cell < 5; - case ENE: - i = cell % 10; - return i == 4 || i == 8 || i == 9 || cell < 5; - default: - return FALSE; - } -} - -/* Rotate a piece 60 degrees clockwise */ -void rotate_piece(int piece) { - int i; - for(i = 0; i < 4; i++) - piece_def[piece][i] = rotate(piece_def[piece][i]); -} - -/* Flip a piece along the horizontal axis */ -void flip_piece(int piece) { - int i; - for(i = 0; i < 4; i++) - piece_def[piece][i] = flip(piece_def[piece][i]); -} - -/* Convenience function to quickly calculate all of the indices for a piece */ -void calc_cell_indices(char *cell, int piece, char index) { - cell[0] = index; - cell[1] = shift(cell[0], piece_def[piece][0]); - cell[2] = shift(cell[1], piece_def[piece][1]); - cell[3] = shift(cell[2], piece_def[piece][2]); - cell[4] = shift(cell[3], piece_def[piece][3]); -} - -/* Convenience function to quickly calculate if a piece fits on the board */ -int cells_fit_on_board(char *cell, int piece) { - return (!out_of_bounds(cell[0], piece_def[piece][0]) && - !out_of_bounds(cell[1], piece_def[piece][1]) && - !out_of_bounds(cell[2], piece_def[piece][2]) && - !out_of_bounds(cell[3], piece_def[piece][3])); -} - -/* Returns the lowest index of the cells of a piece. - * I use the lowest index that a piece occupies as the index for looking up - * the piece in the solve function. - */ -char minimum_of_cells(char *cell) { - char minimum = cell[0]; - minimum = cell[1] < minimum ? cell[1] : minimum; - minimum = cell[2] < minimum ? cell[2] : minimum; - minimum = cell[3] < minimum ? cell[3] : minimum; - minimum = cell[4] < minimum ? cell[4] : minimum; - return minimum; -} - -/* Calculate the lowest possible open cell if the piece is placed on the board. - * Used to later reduce the amount of time searching for open cells in the - * solve function. - */ -char first_empty_cell(char *cell, char minimum) { - char first_empty = minimum; - while(first_empty == cell[0] || first_empty == cell[1] || - first_empty == cell[2] || first_empty == cell[3] || - first_empty == cell[4]) - first_empty++; - return first_empty; -} - -/* Generate the unsigned long long int that will later be anded with the - * board to determine if it fits. - */ -unsigned long long bitmask_from_cells(char *cell) { - unsigned long long piece_mask = 0ULL; - int i; - for(i = 0; i < 5; i++) - piece_mask |= 1ULL << cell[i]; - return piece_mask; -} - -/* Record the piece and other important information in arrays that will - * later be used by the solve function. - */ -void record_piece(int piece, int minimum, char first_empty, - unsigned long long piece_mask) { - pieces[piece][minimum][piece_counts[piece][minimum]] = piece_mask; - next_cell[piece][minimum][piece_counts[piece][minimum]] = first_empty; - piece_counts[piece][minimum]++; -} - - -/* Fill the entire board going cell by cell. If any cells are "trapped" - * they will be left alone. - */ -void fill_contiguous_space(char *board, int index) { - if(board[index] == 1) - return; - board[index] = 1; - if(!out_of_bounds(index, E)) - fill_contiguous_space(board, shift(index, E)); - if(!out_of_bounds(index, SE)) - fill_contiguous_space(board, shift(index, SE)); - if(!out_of_bounds(index, SW)) - fill_contiguous_space(board, shift(index, SW)); - if(!out_of_bounds(index, W)) - fill_contiguous_space(board, shift(index, W)); - if(!out_of_bounds(index, NW)) - fill_contiguous_space(board, shift(index, NW)); - if(!out_of_bounds(index, NE)) - fill_contiguous_space(board, shift(index, NE)); -} - - -/* To thin the number of pieces, I calculate if any of them trap any empty - * cells at the edges. There are only a handful of exceptions where the - * the board can be solved with the trapped cells. For example: piece 8 can - * trap 5 cells in the corner, but piece 3 can fit in those cells, or piece 0 - * can split the board in half where both halves are viable. - */ -int has_island(char *cell, int piece) { - char temp_board[50]; - char c; - int i; - for(i = 0; i < 50; i++) - temp_board[i] = 0; - for(i = 0; i < 5; i++) - temp_board[((int)cell[i])] = 1; - i = 49; - while(temp_board[i] == 1) - i--; - fill_contiguous_space(temp_board, i); - c = 0; - for(i = 0; i < 50; i++) - if(temp_board[i] == 0) - c++; - if(c == 0 || (c == 5 && piece == 8) || (c == 40 && piece == 8) || - (c % 5 == 0 && piece == 0)) - return FALSE; - else - return TRUE; -} - - -/* Calculate all six rotations of the specified piece at the specified index. - * We calculate only half of piece 3's rotations. This is because any solution - * found has an identical solution rotated 180 degrees. Thus we can reduce the - * number of attempted pieces in the solve algorithm by not including the 180- - * degree-rotated pieces of ONE of the pieces. I chose piece 3 because it gave - * me the best time ;) - */ - void calc_six_rotations(char piece, char index) { - char rotation, cell[5]; - char minimum, first_empty; - unsigned long long piece_mask; - - for(rotation = 0; rotation < 6; rotation++) { - if(piece != 3 || rotation < 3) { - calc_cell_indices(cell, piece, index); - if(cells_fit_on_board(cell, piece) && !has_island(cell, piece)) { - minimum = minimum_of_cells(cell); - first_empty = first_empty_cell(cell, minimum); - piece_mask = bitmask_from_cells(cell); - record_piece(piece, minimum, first_empty, piece_mask); - } - } - rotate_piece(piece); - } -} - -/* Calculate every legal rotation for each piece at each board location. */ -void calc_pieces(void) { - char piece, index; - - for(piece = 0; piece < 10; piece++) { - for(index = 0; index < 50; index++) { - calc_six_rotations(piece, index); - flip_piece(piece); - calc_six_rotations(piece, index); - } - } -} - - - -/* Calculate all 32 possible states for a 5-bit row and all rows that will - * create islands that follow any of the 32 possible rows. These pre- - * calculated 5-bit rows will be used to find islands in a partially solved - * board in the solve function. - */ -#define ROW_MASK 0x1F -#define TRIPLE_MASK 0x7FFF -char all_rows[32] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}; -int bad_even_rows[32][32]; -int bad_odd_rows[32][32]; -int bad_even_triple[32768]; -int bad_odd_triple[32768]; - -int rows_bad(char row1, char row2, int even) { - /* even is referring to row1 */ - int i, in_zeroes, group_okay; - char block, row2_shift; - /* Test for blockages at same index and shifted index */ - if(even) - row2_shift = ((row2 << 1) & ROW_MASK) | 0x01; - else - row2_shift = (row2 >> 1) | 0x10; - block = ((row1 ^ row2) & row2) & ((row1 ^ row2_shift) & row2_shift); - /* Test for groups of 0's */ - in_zeroes = FALSE; - group_okay = FALSE; - for(i = 0; i < 5; i++) { - if(row1 & (1 << i)) { - if(in_zeroes) { - if(!group_okay) - return TRUE; - in_zeroes = FALSE; - group_okay = FALSE; - } - } else { - if(!in_zeroes) - in_zeroes = TRUE; - if(!(block & (1 << i))) - group_okay = TRUE; - } - } - if(in_zeroes) - return !group_okay; - else - return FALSE; -} - -/* Check for cases where three rows checked sequentially cause a false - * positive. One scenario is when 5 cells may be surrounded where piece 5 - * or 7 can fit. The other scenario is when piece 2 creates a hook shape. - */ -int triple_is_okay(char row1, char row2, char row3, int even) { - if(even) { - /* There are four cases: - * row1: 00011 00001 11001 10101 - * row2: 01011 00101 10001 10001 - * row3: 011?? 00110 ????? ????? - */ - return ((row1 == 0x03) && (row2 == 0x0B) && ((row3 & 0x1C) == 0x0C)) || - ((row1 == 0x01) && (row2 == 0x05) && (row3 == 0x06)) || - ((row1 == 0x19) && (row2 == 0x11)) || - ((row1 == 0x15) && (row2 == 0x11)); - } else { - /* There are two cases: - * row1: 10011 10101 - * row2: 10001 10001 - * row3: ????? ????? - */ - return ((row1 == 0x13) && (row2 == 0x11)) || - ((row1 == 0x15) && (row2 == 0x11)); - } -} - - -void calc_rows(void) { - int row1, row2, row3; - int result1, result2; - for(row1 = 0; row1 < 32; row1++) { - for(row2 = 0; row2 < 32; row2++) { - bad_even_rows[row1][row2] = rows_bad(row1, row2, TRUE); - bad_odd_rows[row1][row2] = rows_bad(row1, row2, FALSE); - } - } - for(row1 = 0; row1 < 32; row1++) { - for(row2 = 0; row2 < 32; row2++) { - for(row3 = 0; row3 < 32; row3++) { - result1 = bad_even_rows[row1][row2]; - result2 = bad_odd_rows[row2][row3]; - if(result1 == FALSE && result2 == TRUE - && triple_is_okay(row1, row2, row3, TRUE)) - bad_even_triple[row1+(row2*32)+(row3*1024)] = FALSE; - else - bad_even_triple[row1+(row2*32)+(row3*1024)] = result1 || result2; - - result1 = bad_odd_rows[row1][row2]; - result2 = bad_even_rows[row2][row3]; - if(result1 == FALSE && result2 == TRUE - && triple_is_okay(row1, row2, row3, FALSE)) - bad_odd_triple[row1+(row2*32)+(row3*1024)] = FALSE; - else - bad_odd_triple[row1+(row2*32)+(row3*1024)] = result1 || result2; - } - } - } -} - - - -/* Calculate islands while solving the board. - */ -int boardHasIslands(char cell) { - /* Too low on board, don't bother checking */ - if(cell >= 40) - return FALSE; - int current_triple = (board >> ((cell / 5) * 5)) & TRIPLE_MASK; - if((cell / 5) % 2) - return bad_odd_triple[current_triple]; - else - return bad_even_triple[current_triple]; -} - - -/* The recursive solve algorithm. Try to place each permutation in the upper- - * leftmost empty cell. Mark off available pieces as it goes along. - * Because the board is a bit mask, the piece number and bit mask must be saved - * at each successful piece placement. This data is used to create a 50 char - * array if a solution is found. - */ -short avail = 0x03FF; -char sol_nums[10]; -unsigned long long sol_masks[10]; -signed char solutions[2100][50]; -int solution_count = 0; -int max_solutions = 2100; - -void record_solution(void) { - int sol_no, index; - unsigned long long sol_mask; - for(sol_no = 0; sol_no < 10; sol_no++) { - sol_mask = sol_masks[sol_no]; - for(index = 0; index < 50; index++) { - if(sol_mask & 1ULL) { - solutions[solution_count][index] = sol_nums[sol_no]; - /* Board rotated 180 degrees is a solution too! */ - solutions[solution_count+1][49-index] = sol_nums[sol_no]; - } - sol_mask = sol_mask >> 1; - } - } - solution_count += 2; -} - -void solve(int depth, int cell) { - int piece, rotation, max_rots; - unsigned long long *piece_mask; - short piece_no_mask; - - if(solution_count >= max_solutions) - return; - - while(board & (1ULL << cell)) - cell++; - - for(piece = 0; piece < 10; piece++) { - piece_no_mask = 1 << piece; - if(!(avail & piece_no_mask)) - continue; - avail ^= piece_no_mask; - max_rots = piece_counts[piece][cell]; - piece_mask = pieces[piece][cell]; - for(rotation = 0; rotation < max_rots; rotation++) { - if(!(board & *(piece_mask + rotation))) { - sol_nums[depth] = piece; - sol_masks[depth] = *(piece_mask + rotation); - if(depth == 9) { - /* Solution found!!!!!11!!ONE! */ - record_solution(); - avail ^= piece_no_mask; - return; - } - board |= *(piece_mask + rotation); - if(!boardHasIslands(next_cell[piece][cell][rotation])) - solve(depth + 1, next_cell[piece][cell][rotation]); - board ^= *(piece_mask + rotation); - } - } - avail ^= piece_no_mask; - } -} - - -/* qsort comparator - used to find first and last solutions */ -int solution_sort(const void *elem1, const void *elem2) { - signed char *char1 = (signed char *) elem1; - signed char *char2 = (signed char *) elem2; - int i = 0; - while(i < 50 && char1[i] == char2[i]) - i++; - return char1[i] - char2[i]; -} - - -/* pretty print a board in the specified hexagonal format */ -void pretty(signed char *b) { - int i; - for(i = 0; i < 50; i += 10) { - printf("%c %c %c %c %c \n %c %c %c %c %c \n", b[i]+'0', b[i+1]+'0', - b[i+2]+'0', b[i+3]+'0', b[i+4]+'0', b[i+5]+'0', b[i+6]+'0', - b[i+7]+'0', b[i+8]+'0', b[i+9]+'0'); - } - printf("\n"); -} -#endif Index: gcc/testsuite/g++.dg/pph/c2meteor-contest.h =================================================================== --- gcc/testsuite/g++.dg/pph/c2meteor-contest.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2meteor-contest.h (working copy) @@ -1,617 +0,0 @@ -/* { dg-options "-w" } */ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H -/* -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of "The Computer Language Benchmarks Game" nor the - name of "The Computer Language Shootout Benchmarks" nor the names of - its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. -*/ - -/* The Computer Language Benchmarks Game - * http://shootout.alioth.debian.org/ - * - * contributed by Christian Vosteen - */ - -#include <stdlib.h> -#include <stdio.h> -#define TRUE 1 -#define FALSE 0 - -/* The board is a 50 cell hexagonal pattern. For . . . . . - * maximum speed the board will be implemented as . . . . . - * 50 bits, which will fit into a 64 bit long long . . . . . - * int. . . . . . - * . . . . . - * I will represent 0's as empty cells and 1's . . . . . - * as full cells. . . . . . - * . . . . . - * . . . . . - * . . . . . - */ - -unsigned long long board = 0xFFFC000000000000ULL; - -/* The puzzle pieces must be specified by the path followed - * from one end to the other along 12 hexagonal directions. - * - * Piece 0 Piece 1 Piece 2 Piece 3 Piece 4 - * - * O O O O O O O O O O O O O O O - * O O O O O O O - * O O O - * - * Piece 5 Piece 6 Piece 7 Piece 8 Piece 9 - * - * O O O O O O O O O O O O O - * O O O O O O O O O - * O O O - * - * I had to make it 12 directions because I wanted all of the - * piece definitions to fit into the same size arrays. It is - * not possible to define piece 4 in terms of the 6 cardinal - * directions in 4 moves. - */ - -#define E 0 -#define ESE 1 -#define SE 2 -#define S 3 -#define SW 4 -#define WSW 5 -#define W 6 -#define WNW 7 -#define NW 8 -#define N 9 -#define NE 10 -#define ENE 11 -#define PIVOT 12 - -char piece_def[10][4] = { - { E, E, E, SE}, - { SE, E, NE, E}, - { E, E, SE, SW}, - { E, E, SW, SE}, - { SE, E, NE, S}, - { E, E, SW, E}, - { E, SE, SE, NE}, - { E, SE, SE, W}, - { E, SE, E, E}, - { E, E, E, SW} -}; - - -/* To minimize the amount of work done in the recursive solve function below, - * I'm going to allocate enough space for all legal rotations of each piece - * at each position on the board. That's 10 pieces x 50 board positions x - * 12 rotations. However, not all 12 rotations will fit on every cell, so - * I'll have to keep count of the actual number that do. - * The pieces are going to be unsigned long long ints just like the board so - * they can be bitwise-anded with the board to determine if they fit. - * I'm also going to record the next possible open cell for each piece and - * location to reduce the burden on the solve function. - */ -unsigned long long pieces[10][50][12]; -int piece_counts[10][50]; -char next_cell[10][50][12]; - -/* Returns the direction rotated 60 degrees clockwise */ -char rotate(char dir) { - return (dir + 2) % PIVOT; -} - -/* Returns the direction flipped on the horizontal axis */ -char flip(char dir) { - return (PIVOT - dir) % PIVOT; -} - - -/* Returns the new cell index from the specified cell in the - * specified direction. The index is only valid if the - * starting cell and direction have been checked by the - * out_of_bounds function first. - */ -char shift(char cell, char dir) { - switch(dir) { - case E: - return cell + 1; - case ESE: - if((cell / 5) % 2) - return cell + 7; - else - return cell + 6; - case SE: - if((cell / 5) % 2) - return cell + 6; - else - return cell + 5; - case S: - return cell + 10; - case SW: - if((cell / 5) % 2) - return cell + 5; - else - return cell + 4; - case WSW: - if((cell / 5) % 2) - return cell + 4; - else - return cell + 3; - case W: - return cell - 1; - case WNW: - if((cell / 5) % 2) - return cell - 6; - else - return cell - 7; - case NW: - if((cell / 5) % 2) - return cell - 5; - else - return cell - 6; - case N: - return cell - 10; - case NE: - if((cell / 5) % 2) - return cell - 4; - else - return cell - 5; - case ENE: - if((cell / 5) % 2) - return cell - 3; - else - return cell - 4; - default: - return cell; - } -} - -/* Returns wether the specified cell and direction will land outside - * of the board. Used to determine if a piece is at a legal board - * location or not. - */ -char out_of_bounds(char cell, char dir) { - char i; - switch(dir) { - case E: - return cell % 5 == 4; - case ESE: - i = cell % 10; - return i == 4 || i == 8 || i == 9 || cell >= 45; - case SE: - return cell % 10 == 9 || cell >= 45; - case S: - return cell >= 40; - case SW: - return cell % 10 == 0 || cell >= 45; - case WSW: - i = cell % 10; - return i == 0 || i == 1 || i == 5 || cell >= 45; - case W: - return cell % 5 == 0; - case WNW: - i = cell % 10; - return i == 0 || i == 1 || i == 5 || cell < 5; - case NW: - return cell % 10 == 0 || cell < 5; - case N: - return cell < 10; - case NE: - return cell % 10 == 9 || cell < 5; - case ENE: - i = cell % 10; - return i == 4 || i == 8 || i == 9 || cell < 5; - default: - return FALSE; - } -} - -/* Rotate a piece 60 degrees clockwise */ -void rotate_piece(int piece) { - int i; - for(i = 0; i < 4; i++) - piece_def[piece][i] = rotate(piece_def[piece][i]); -} - -/* Flip a piece along the horizontal axis */ -void flip_piece(int piece) { - int i; - for(i = 0; i < 4; i++) - piece_def[piece][i] = flip(piece_def[piece][i]); -} - -/* Convenience function to quickly calculate all of the indices for a piece */ -void calc_cell_indices(char *cell, int piece, char index) { - cell[0] = index; - cell[1] = shift(cell[0], piece_def[piece][0]); - cell[2] = shift(cell[1], piece_def[piece][1]); - cell[3] = shift(cell[2], piece_def[piece][2]); - cell[4] = shift(cell[3], piece_def[piece][3]); -} - -/* Convenience function to quickly calculate if a piece fits on the board */ -int cells_fit_on_board(char *cell, int piece) { - return (!out_of_bounds(cell[0], piece_def[piece][0]) && - !out_of_bounds(cell[1], piece_def[piece][1]) && - !out_of_bounds(cell[2], piece_def[piece][2]) && - !out_of_bounds(cell[3], piece_def[piece][3])); -} - -/* Returns the lowest index of the cells of a piece. - * I use the lowest index that a piece occupies as the index for looking up - * the piece in the solve function. - */ -char minimum_of_cells(char *cell) { - char minimum = cell[0]; - minimum = cell[1] < minimum ? cell[1] : minimum; - minimum = cell[2] < minimum ? cell[2] : minimum; - minimum = cell[3] < minimum ? cell[3] : minimum; - minimum = cell[4] < minimum ? cell[4] : minimum; - return minimum; -} - -/* Calculate the lowest possible open cell if the piece is placed on the board. - * Used to later reduce the amount of time searching for open cells in the - * solve function. - */ -char first_empty_cell(char *cell, char minimum) { - char first_empty = minimum; - while(first_empty == cell[0] || first_empty == cell[1] || - first_empty == cell[2] || first_empty == cell[3] || - first_empty == cell[4]) - first_empty++; - return first_empty; -} - -/* Generate the unsigned long long int that will later be anded with the - * board to determine if it fits. - */ -unsigned long long bitmask_from_cells(char *cell) { - unsigned long long piece_mask = 0ULL; - int i; - for(i = 0; i < 5; i++) - piece_mask |= 1ULL << cell[i]; - return piece_mask; -} - -/* Record the piece and other important information in arrays that will - * later be used by the solve function. - */ -void record_piece(int piece, int minimum, char first_empty, - unsigned long long piece_mask) { - pieces[piece][minimum][piece_counts[piece][minimum]] = piece_mask; - next_cell[piece][minimum][piece_counts[piece][minimum]] = first_empty; - piece_counts[piece][minimum]++; -} - - -/* Fill the entire board going cell by cell. If any cells are "trapped" - * they will be left alone. - */ -void fill_contiguous_space(char *board, int index) { - if(board[index] == 1) - return; - board[index] = 1; - if(!out_of_bounds(index, E)) - fill_contiguous_space(board, shift(index, E)); - if(!out_of_bounds(index, SE)) - fill_contiguous_space(board, shift(index, SE)); - if(!out_of_bounds(index, SW)) - fill_contiguous_space(board, shift(index, SW)); - if(!out_of_bounds(index, W)) - fill_contiguous_space(board, shift(index, W)); - if(!out_of_bounds(index, NW)) - fill_contiguous_space(board, shift(index, NW)); - if(!out_of_bounds(index, NE)) - fill_contiguous_space(board, shift(index, NE)); -} - - -/* To thin the number of pieces, I calculate if any of them trap any empty - * cells at the edges. There are only a handful of exceptions where the - * the board can be solved with the trapped cells. For example: piece 8 can - * trap 5 cells in the corner, but piece 3 can fit in those cells, or piece 0 - * can split the board in half where both halves are viable. - */ -int has_island(char *cell, int piece) { - char temp_board[50]; - char c; - int i; - for(i = 0; i < 50; i++) - temp_board[i] = 0; - for(i = 0; i < 5; i++) - temp_board[((int)cell[i])] = 1; - i = 49; - while(temp_board[i] == 1) - i--; - fill_contiguous_space(temp_board, i); - c = 0; - for(i = 0; i < 50; i++) - if(temp_board[i] == 0) - c++; - if(c == 0 || (c == 5 && piece == 8) || (c == 40 && piece == 8) || - (c % 5 == 0 && piece == 0)) - return FALSE; - else - return TRUE; -} - - -/* Calculate all six rotations of the specified piece at the specified index. - * We calculate only half of piece 3's rotations. This is because any solution - * found has an identical solution rotated 180 degrees. Thus we can reduce the - * number of attempted pieces in the solve algorithm by not including the 180- - * degree-rotated pieces of ONE of the pieces. I chose piece 3 because it gave - * me the best time ;) - */ - void calc_six_rotations(char piece, char index) { - char rotation, cell[5]; - char minimum, first_empty; - unsigned long long piece_mask; - - for(rotation = 0; rotation < 6; rotation++) { - if(piece != 3 || rotation < 3) { - calc_cell_indices(cell, piece, index); - if(cells_fit_on_board(cell, piece) && !has_island(cell, piece)) { - minimum = minimum_of_cells(cell); - first_empty = first_empty_cell(cell, minimum); - piece_mask = bitmask_from_cells(cell); - record_piece(piece, minimum, first_empty, piece_mask); - } - } - rotate_piece(piece); - } -} - -/* Calculate every legal rotation for each piece at each board location. */ -void calc_pieces(void) { - char piece, index; - - for(piece = 0; piece < 10; piece++) { - for(index = 0; index < 50; index++) { - calc_six_rotations(piece, index); - flip_piece(piece); - calc_six_rotations(piece, index); - } - } -} - - - -/* Calculate all 32 possible states for a 5-bit row and all rows that will - * create islands that follow any of the 32 possible rows. These pre- - * calculated 5-bit rows will be used to find islands in a partially solved - * board in the solve function. - */ -#define ROW_MASK 0x1F -#define TRIPLE_MASK 0x7FFF -char all_rows[32] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}; -int bad_even_rows[32][32]; -int bad_odd_rows[32][32]; -int bad_even_triple[32768]; -int bad_odd_triple[32768]; - -int rows_bad(char row1, char row2, int even) { - /* even is referring to row1 */ - int i, in_zeroes, group_okay; - char block, row2_shift; - /* Test for blockages at same index and shifted index */ - if(even) - row2_shift = ((row2 << 1) & ROW_MASK) | 0x01; - else - row2_shift = (row2 >> 1) | 0x10; - block = ((row1 ^ row2) & row2) & ((row1 ^ row2_shift) & row2_shift); - /* Test for groups of 0's */ - in_zeroes = FALSE; - group_okay = FALSE; - for(i = 0; i < 5; i++) { - if(row1 & (1 << i)) { - if(in_zeroes) { - if(!group_okay) - return TRUE; - in_zeroes = FALSE; - group_okay = FALSE; - } - } else { - if(!in_zeroes) - in_zeroes = TRUE; - if(!(block & (1 << i))) - group_okay = TRUE; - } - } - if(in_zeroes) - return !group_okay; - else - return FALSE; -} - -/* Check for cases where three rows checked sequentially cause a false - * positive. One scenario is when 5 cells may be surrounded where piece 5 - * or 7 can fit. The other scenario is when piece 2 creates a hook shape. - */ -int triple_is_okay(char row1, char row2, char row3, int even) { - if(even) { - /* There are four cases: - * row1: 00011 00001 11001 10101 - * row2: 01011 00101 10001 10001 - * row3: 011?? 00110 ????? ????? - */ - return ((row1 == 0x03) && (row2 == 0x0B) && ((row3 & 0x1C) == 0x0C)) || - ((row1 == 0x01) && (row2 == 0x05) && (row3 == 0x06)) || - ((row1 == 0x19) && (row2 == 0x11)) || - ((row1 == 0x15) && (row2 == 0x11)); - } else { - /* There are two cases: - * row1: 10011 10101 - * row2: 10001 10001 - * row3: ????? ????? - */ - return ((row1 == 0x13) && (row2 == 0x11)) || - ((row1 == 0x15) && (row2 == 0x11)); - } -} - - -void calc_rows(void) { - int row1, row2, row3; - int result1, result2; - for(row1 = 0; row1 < 32; row1++) { - for(row2 = 0; row2 < 32; row2++) { - bad_even_rows[row1][row2] = rows_bad(row1, row2, TRUE); - bad_odd_rows[row1][row2] = rows_bad(row1, row2, FALSE); - } - } - for(row1 = 0; row1 < 32; row1++) { - for(row2 = 0; row2 < 32; row2++) { - for(row3 = 0; row3 < 32; row3++) { - result1 = bad_even_rows[row1][row2]; - result2 = bad_odd_rows[row2][row3]; - if(result1 == FALSE && result2 == TRUE - && triple_is_okay(row1, row2, row3, TRUE)) - bad_even_triple[row1+(row2*32)+(row3*1024)] = FALSE; - else - bad_even_triple[row1+(row2*32)+(row3*1024)] = result1 || result2; - - result1 = bad_odd_rows[row1][row2]; - result2 = bad_even_rows[row2][row3]; - if(result1 == FALSE && result2 == TRUE - && triple_is_okay(row1, row2, row3, FALSE)) - bad_odd_triple[row1+(row2*32)+(row3*1024)] = FALSE; - else - bad_odd_triple[row1+(row2*32)+(row3*1024)] = result1 || result2; - } - } - } -} - - - -/* Calculate islands while solving the board. - */ -int boardHasIslands(char cell) { - /* Too low on board, don't bother checking */ - if(cell >= 40) - return FALSE; - int current_triple = (board >> ((cell / 5) * 5)) & TRIPLE_MASK; - if((cell / 5) % 2) - return bad_odd_triple[current_triple]; - else - return bad_even_triple[current_triple]; -} - - -/* The recursive solve algorithm. Try to place each permutation in the upper- - * leftmost empty cell. Mark off available pieces as it goes along. - * Because the board is a bit mask, the piece number and bit mask must be saved - * at each successful piece placement. This data is used to create a 50 char - * array if a solution is found. - */ -short avail = 0x03FF; -char sol_nums[10]; -unsigned long long sol_masks[10]; -signed char solutions[2100][50]; -int solution_count = 0; -int max_solutions = 2100; - -void record_solution(void) { - int sol_no, index; - unsigned long long sol_mask; - for(sol_no = 0; sol_no < 10; sol_no++) { - sol_mask = sol_masks[sol_no]; - for(index = 0; index < 50; index++) { - if(sol_mask & 1ULL) { - solutions[solution_count][index] = sol_nums[sol_no]; - /* Board rotated 180 degrees is a solution too! */ - solutions[solution_count+1][49-index] = sol_nums[sol_no]; - } - sol_mask = sol_mask >> 1; - } - } - solution_count += 2; -} - -void solve(int depth, int cell) { - int piece, rotation, max_rots; - unsigned long long *piece_mask; - short piece_no_mask; - - if(solution_count >= max_solutions) - return; - - while(board & (1ULL << cell)) - cell++; - - for(piece = 0; piece < 10; piece++) { - piece_no_mask = 1 << piece; - if(!(avail & piece_no_mask)) - continue; - avail ^= piece_no_mask; - max_rots = piece_counts[piece][cell]; - piece_mask = pieces[piece][cell]; - for(rotation = 0; rotation < max_rots; rotation++) { - if(!(board & *(piece_mask + rotation))) { - sol_nums[depth] = piece; - sol_masks[depth] = *(piece_mask + rotation); - if(depth == 9) { - /* Solution found!!!!!11!!ONE! */ - record_solution(); - avail ^= piece_no_mask; - return; - } - board |= *(piece_mask + rotation); - if(!boardHasIslands(next_cell[piece][cell][rotation])) - solve(depth + 1, next_cell[piece][cell][rotation]); - board ^= *(piece_mask + rotation); - } - } - avail ^= piece_no_mask; - } -} - - -/* qsort comparator - used to find first and last solutions */ -int solution_sort(const void *elem1, const void *elem2) { - signed char *char1 = (signed char *) elem1; - signed char *char2 = (signed char *) elem2; - int i = 0; - while(i < 50 && char1[i] == char2[i]) - i++; - return char1[i] - char2[i]; -} - - -/* pretty print a board in the specified hexagonal format */ -void pretty(signed char *b) { - int i; - for(i = 0; i < 50; i += 10) { - printf("%c %c %c %c %c \n %c %c %c %c %c \n", b[i]+'0', b[i+1]+'0', - b[i+2]+'0', b[i+3]+'0', b[i+4]+'0', b[i+5]+'0', b[i+6]+'0', - b[i+7]+'0', b[i+8]+'0', b[i+9]+'0'); - } - printf("\n"); -} -#endif Index: gcc/testsuite/g++.dg/pph/c1funcmac.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1funcmac.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1funcmac.cc (working copy) @@ -1,4 +1,4 @@ -#include "c1funcmac.h" +#include "c0funcmac.h" #define outer(major, minor) inner(major, minor) void outer(long one, short two) { } major(three); Index: gcc/testsuite/g++.dg/pph/a1dynarray-use2.cci =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-use2.cci (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-use2.cci (working copy) @@ -1,10 +0,0 @@ - integer_array target(8); - integer_array::iterator tgt( target.begin() ); - const integer* srt = &sorted.front(); - for ( ; tgt != target.end(); ++tgt ) { - *tgt = *srt; - if ( srt == &sorted.back() ) - srt = &sorted.front(); - else - ++srt; - } Index: gcc/testsuite/g++.dg/pph/x1autometh.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1autometh.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1autometh.h (working copy) @@ -1,9 +0,0 @@ -#ifndef X1AUTOMETH_H -#define X1AUTOMETH_H -class base { - virtual int method() { - return 0; - } - int field; -}; -#endif Index: gcc/testsuite/g++.dg/pph/c4meteor-contest.h =================================================================== --- gcc/testsuite/g++.dg/pph/c4meteor-contest.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c4meteor-contest.h (working copy) @@ -1,6 +1,6 @@ /* { dg-options "-w" } */ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H +#ifndef C4METEOR_CONTEST_H +#define C4METEOR_CONTEST_H /* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Index: gcc/testsuite/g++.dg/pph/x0overload2.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0overload2.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0overload2.h (working copy) @@ -1,4 +1,4 @@ -#ifndef X2OVERLOAD2_H -#define X2OVERLOAD2_H +#ifndef X0OVERLOAD2_H +#define X0OVERLOAD2_H int o(float x); #endif Index: gcc/testsuite/g++.dg/pph/x1globalref.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1globalref.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1globalref.h (working copy) @@ -1,7 +0,0 @@ -#ifndef X1GLOBALREF_H -#define X1GLOBALREF_H -typedef int type; -const type n = 3; -const type m = 4; -type a[n+m]; -#endif Index: gcc/testsuite/g++.dg/pph/c1varorder.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1varorder.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1varorder.cc (working copy) @@ -1,4 +1,4 @@ -#include "c1varorder.h" +#include "c0varorder.h" int foo(void) { Index: gcc/testsuite/g++.dg/pph/x1struct1.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1struct1.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1struct1.cc (working copy) @@ -1,10 +0,0 @@ -#include "x1struct1.h" - -type D::method() -{ static int x = 2; - return fld + mbr; } - -type D::mbr = 4; -typedef D D2; -D2 var1; -D2 var2 = var1; Index: gcc/testsuite/g++.dg/pph/c0empty.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0empty.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0empty.h (working copy) @@ -1,3 +1,3 @@ -#ifndef C1EMPTY_H -#define C1EMPTY_H +#ifndef C0EMPTY_H +#define C0EMPTY_H #endif Index: gcc/testsuite/g++.dg/pph/c1limits-externalid.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1limits-externalid.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1limits-externalid.h (working copy) @@ -1,18 +0,0 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H -#define LIM1(x) x##0; x##1; x##2; x##3; x##4; x##5; x##6; x##7; x##8; x##9; -#define LIM2(x) LIM1(x##0) LIM1(x##1) LIM1(x##2) LIM1(x##3) LIM1(x##4) \ - LIM1(x##5) LIM1(x##6) LIM1(x##7) LIM1(x##8) LIM1(x##9) -#define LIM3(x) LIM2(x##0) LIM2(x##1) LIM2(x##2) LIM2(x##3) LIM2(x##4) \ - LIM2(x##5) LIM2(x##6) LIM2(x##7) LIM2(x##8) LIM2(x##9) -#define LIM4(x) LIM3(x##0) LIM3(x##1) LIM3(x##2) LIM3(x##3) LIM3(x##4) \ - LIM3(x##5) LIM3(x##6) LIM3(x##7) LIM3(x##8) LIM3(x##9) -#define LIM5(x) LIM4(x##0) LIM4(x##1) LIM4(x##2) LIM4(x##3) LIM4(x##4) \ - LIM4(x##5) LIM4(x##6) LIM4(x##7) LIM4(x##8) LIM4(x##9) -#define LIM6(x) LIM5(x##0) LIM5(x##1) LIM5(x##2) LIM5(x##3) LIM5(x##4) \ - LIM5(x##5) LIM5(x##6) LIM5(x##7) LIM5(x##8) LIM5(x##9) -#define LIM7(x) LIM6(x##0) LIM6(x##1) LIM6(x##2) LIM6(x##3) LIM6(x##4) \ - LIM6(x##5) LIM6(x##6) LIM6(x##7) LIM6(x##8) LIM6(x##9) - -LIM5(char t) -#endif Index: gcc/testsuite/g++.dg/pph/x0dynarray2.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0dynarray2.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0dynarray2.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1DYNARRAY2_H -#define X1DYNARRAY2_H +#ifndef X0DYNARRAY2_H +#define X0DYNARRAY2_H extern "C" void *memcpy(void *dest, const void *src, unsigned long n); extern "C" void exit(int) throw(); @@ -9,14 +9,14 @@ namespace tst { template< typename T > struct dynarray { - #include "a1dynarray-dcl1.hi" - #include "a1dynarray-dcl2a.hi" - #include "a1dynarray-dcl3.hi" + #include "a0dynarray-dcl1.hi" + #include "a0dynarray-dcl2a.hi" + #include "a0dynarray-dcl3.hi" }; -#include "a1dynarray-dfn1a.hi" -#include "a1dynarray-dfn2a.hi" -#include "a1dynarray-dfn3a.hi" +#include "a0dynarray-dfn1a.hi" +#include "a0dynarray-dfn2a.hi" +#include "a0dynarray-dfn3a.hi" } // namespace tst Index: gcc/testsuite/g++.dg/pph/y2overload.cc =================================================================== --- gcc/testsuite/g++.dg/pph/y2overload.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/y2overload.cc (working copy) @@ -1,9 +0,0 @@ -#include "x2overload1.h" -#include "x2overload2.h" -#include "x2overload3.h" -// { dg-error "inconsistent overload resolution" "" { xfail *-*-* } } - -int g() -{ - return f(); -} Index: gcc/testsuite/g++.dg/pph/c1typerefs.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1typerefs.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1typerefs.h (working copy) @@ -1,7 +0,0 @@ -#ifndef C1TYPEREFS_H -#define C1TYPEREFS_H -struct base { - int field; -}; -base function(); -#endif Index: gcc/testsuite/g++.dg/pph/x1dynarray6.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray6.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray6.cc (working copy) @@ -1,28 +0,0 @@ -// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } -// { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } - -#include <algorithm> -#include <iostream> - -#include "x1dynarray6.h" - -#include "a1integer.h" -typedef tst::dynarray< integer > integer_array; - -#include "a1dynarray-hlp1.cci" - -int main() -{ - #include "a1dynarray-use1.cci" - dump( source ); - dump( sorted ); - std::sort( sorted.begin(), sorted.end() ); - dump( sorted ); - #include "a1dynarray-use2.cci" - dump( target ); - #include "a1dynarray-use3b.cci" - #include "a1dynarray-use4a.cci" - return sum - 23; -} Index: gcc/testsuite/g++.dg/pph/c1variables.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1variables.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1variables.cc (working copy) @@ -1,4 +1,4 @@ -#include "c1variables.h" +#include "c0variables.h" int gbl_initial = 1; const float gbl_init_const = 1.5; Index: gcc/testsuite/g++.dg/pph/c1meteor-contest.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c1meteor-contest.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1meteor-contest.cc (working copy) @@ -1,7 +1,7 @@ /* { dg-options "-w" } */ /* { dg-do run } */ -#include "c1meteor-contest.h" +#include "c0meteor-contest.h" int main(int argc, char **argv) { if(argc > 1) Index: gcc/testsuite/g++.dg/pph/c2eabi1.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c2eabi1.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2eabi1.cc (working copy) @@ -1,191 +0,0 @@ -/* { dg-options "-w" } */ -// pph asm xdiff - -#include "c2eabi1.h" - -int main () { - unsigned char bytes[256]; - int i, j, k, n; - int *result; - - /* Table 2. Double-precision floating-point arithmetic. */ - deq (__aeabi_dadd (dzero, done), done); - deq (__aeabi_dadd (done, done), dtwo); - deq (__aeabi_ddiv (dminus_four, dminus_two), dtwo); - deq (__aeabi_ddiv (dminus_two, dtwo), dminus_one); - deq (__aeabi_dmul (dtwo, dtwo), dfour); - deq (__aeabi_dmul (dminus_one, dminus_two), dtwo); - deq (__aeabi_dneg (dminus_one), done); - deq (__aeabi_dneg (dfour), dminus_four); - deq (__aeabi_drsub (done, dzero), dminus_one); - deq (__aeabi_drsub (dtwo, dminus_two), dminus_four); - deq (__aeabi_dsub (dzero, done), dminus_one); - deq (__aeabi_dsub (dminus_two, dtwo), dminus_four); - - /* Table 3. Double-precision floating-point comparisons. */ - ieq (__aeabi_dcmpeq (done, done), 1); - ieq (__aeabi_dcmpeq (done, dzero), 0); - ieq (__aeabi_dcmpeq (dNaN, dzero), 0); - ieq (__aeabi_dcmpeq (dNaN, dNaN), 0); - - ieq (__aeabi_dcmplt (dzero, done), 1); - ieq (__aeabi_dcmplt (done, dzero), 0); - ieq (__aeabi_dcmplt (dzero, dzero), 0); - ieq (__aeabi_dcmplt (dzero, dNaN), 0); - ieq (__aeabi_dcmplt (dNaN, dNaN), 0); - - ieq (__aeabi_dcmple (dzero, done), 1); - ieq (__aeabi_dcmple (done, dzero), 0); - ieq (__aeabi_dcmple (dzero, dzero), 1); - ieq (__aeabi_dcmple (dzero, dNaN), 0); - ieq (__aeabi_dcmple (dNaN, dNaN), 0); - - ieq (__aeabi_dcmpge (dzero, done), 0); - ieq (__aeabi_dcmpge (done, dzero), 1); - ieq (__aeabi_dcmpge (dzero, dzero), 1); - ieq (__aeabi_dcmpge (dzero, dNaN), 0); - ieq (__aeabi_dcmpge (dNaN, dNaN), 0); - - ieq (__aeabi_dcmpgt (dzero, done), 0); - ieq (__aeabi_dcmpgt (done, dzero), 1); - ieq (__aeabi_dcmplt (dzero, dzero), 0); - ieq (__aeabi_dcmpgt (dzero, dNaN), 0); - ieq (__aeabi_dcmpgt (dNaN, dNaN), 0); - - ieq (__aeabi_dcmpun (done, done), 0); - ieq (__aeabi_dcmpun (done, dzero), 0); - ieq (__aeabi_dcmpun (dNaN, dzero), 1); - ieq (__aeabi_dcmpun (dNaN, dNaN), 1); - - /* Table 4. Single-precision floating-point arithmetic. */ - feq (__aeabi_fadd (fzero, fone), fone); - feq (__aeabi_fadd (fone, fone), ftwo); - feq (__aeabi_fdiv (fminus_four, fminus_two), ftwo); - feq (__aeabi_fdiv (fminus_two, ftwo), fminus_one); - feq (__aeabi_fmul (ftwo, ftwo), ffour); - feq (__aeabi_fmul (fminus_one, fminus_two), ftwo); - feq (__aeabi_fneg (fminus_one), fone); - feq (__aeabi_fneg (ffour), fminus_four); - feq (__aeabi_frsub (fone, fzero), fminus_one); - feq (__aeabi_frsub (ftwo, fminus_two), fminus_four); - feq (__aeabi_fsub (fzero, fone), fminus_one); - feq (__aeabi_fsub (fminus_two, ftwo), fminus_four); - - /* Table 5. Single-precision floating-point comparisons. */ - ieq (__aeabi_fcmpeq (fone, fone), 1); - ieq (__aeabi_fcmpeq (fone, fzero), 0); - ieq (__aeabi_fcmpeq (fNaN, fzero), 0); - ieq (__aeabi_fcmpeq (fNaN, fNaN), 0); - - ieq (__aeabi_fcmplt (fzero, fone), 1); - ieq (__aeabi_fcmplt (fone, fzero), 0); - ieq (__aeabi_fcmplt (fzero, fzero), 0); - ieq (__aeabi_fcmplt (fzero, fNaN), 0); - ieq (__aeabi_fcmplt (fNaN, fNaN), 0); - - ieq (__aeabi_fcmple (fzero, fone), 1); - ieq (__aeabi_fcmple (fone, fzero), 0); - ieq (__aeabi_fcmple (fzero, fzero), 1); - ieq (__aeabi_fcmple (fzero, fNaN), 0); - ieq (__aeabi_fcmple (fNaN, fNaN), 0); - - ieq (__aeabi_fcmpge (fzero, fone), 0); - ieq (__aeabi_fcmpge (fone, fzero), 1); - ieq (__aeabi_fcmpge (fzero, fzero), 1); - ieq (__aeabi_fcmpge (fzero, fNaN), 0); - ieq (__aeabi_fcmpge (fNaN, fNaN), 0); - - ieq (__aeabi_fcmpgt (fzero, fone), 0); - ieq (__aeabi_fcmpgt (fone, fzero), 1); - ieq (__aeabi_fcmplt (fzero, fzero), 0); - ieq (__aeabi_fcmpgt (fzero, fNaN), 0); - ieq (__aeabi_fcmpgt (fNaN, fNaN), 0); - - ieq (__aeabi_fcmpun (fone, fone), 0); - ieq (__aeabi_fcmpun (fone, fzero), 0); - ieq (__aeabi_fcmpun (fNaN, fzero), 1); - ieq (__aeabi_fcmpun (fNaN, fNaN), 1); - - /* Table 6. Floating-point to integer conversions. */ - ieq (__aeabi_d2iz (dminus_one), -1); - ueq (__aeabi_d2uiz (done), 1); - leq (__aeabi_d2lz (dminus_two), -2LL); - uleq (__aeabi_d2ulz (dfour), 4LL); - ieq (__aeabi_f2iz (fminus_one), -1); - ueq (__aeabi_f2uiz (fone), 1); - leq (__aeabi_f2lz (fminus_two), -2LL); - uleq (__aeabi_f2ulz (ffour), 4LL); - - /* Table 7. Conversions between floating types. */ - feq (__aeabi_d2f (dtwo), ftwo); - deq (__aeabi_f2d (fminus_four), dminus_four); - - /* Table 8. Integer to floating-point conversions. */ - deq (__aeabi_i2d (-1), dminus_one); - deq (__aeabi_ui2d (2), dtwo); - deq (__aeabi_l2d (-1), dminus_one); - deq (__aeabi_ul2d (2ULL), dtwo); - feq (__aeabi_i2f (-1), fminus_one); - feq (__aeabi_ui2f (2), ftwo); - feq (__aeabi_l2f (-1), fminus_one); - feq (__aeabi_ul2f (2ULL), ftwo); - - /* Table 9. Long long functions. */ - leq (__aeabi_lmul (4LL, -1LL), -4LL); - leq (__aeabi_llsl (2LL, 1), 4LL); - leq (__aeabi_llsr (-1LL, 63), 1); - leq (__aeabi_lasr (-1LL, 63), -1); - - result = lcmp_results; - for (i = 0; i < NUM_CMP_VALUES; i++) - for (j = 0; j < NUM_CMP_VALUES; j++) - for (k = 0; k < NUM_CMP_VALUES; k++) - for (n = 0; n < NUM_CMP_VALUES; n++) - { - ieq (signof (__aeabi_lcmp - (((long long)cmp_val[i] << 32) | cmp_val[k], - ((long long)cmp_val[j] << 32) | cmp_val[n])), - *result); - result++; - } - result = ulcmp_results; - for (i = 0; i < NUM_CMP_VALUES; i++) - for (j = 0; j < NUM_CMP_VALUES; j++) - for (k = 0; k < NUM_CMP_VALUES; k++) - for (n = 0; n < NUM_CMP_VALUES; n++) - { - ieq (signof (__aeabi_ulcmp - (((long long)cmp_val[i] << 32) | cmp_val[k], - ((long long)cmp_val[j] << 32) | cmp_val[n])), - *result); - result++; - } - - ieq (__aeabi_idiv (-550, 11), -50); - ueq (__aeabi_uidiv (4000000000U, 1000000U), 4000U); - - for (i = 0; i < 256; i++) - bytes[i] = i; - -#ifdef __ARMEB__ - ieq (__aeabi_uread4 (bytes + 1), 0x01020304U); - leq (__aeabi_uread8 (bytes + 3), 0x030405060708090aLL); - ieq (__aeabi_uwrite4 (0x66778899U, bytes + 5), 0x66778899U); - leq (__aeabi_uwrite8 (0x2030405060708090LL, bytes + 15), - 0x2030405060708090LL); -#else - ieq (__aeabi_uread4 (bytes + 1), 0x04030201U); - leq (__aeabi_uread8 (bytes + 3), 0x0a09080706050403LL); - ieq (__aeabi_uwrite4 (0x99887766U, bytes + 5), 0x99887766U); - leq (__aeabi_uwrite8 (0x9080706050403020LL, bytes + 15), - 0x9080706050403020LL); -#endif - - for (i = 0; i < 4; i++) - ieq (bytes[5 + i], (6 + i) * 0x11); - - for (i = 0; i < 8; i++) - ieq (bytes[15 + i], (2 + i) * 0x10); - - exit (0); -} Index: gcc/testsuite/g++.dg/pph/x0namespace.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0namespace.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0namespace.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1NAMESPACE_H -#define X1NAMESPACE_H +#ifndef X0NAMESPACE_H +#define X0NAMESPACE_H namespace A { extern int x; struct B; Index: gcc/testsuite/g++.dg/pph/c4eabi1.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c4eabi1.cc (revision 176055) +++ gcc/testsuite/g++.dg/pph/c4eabi1.cc (working copy) @@ -1,8 +1,7 @@ -// { dg-timeout 3 { target *-*-* } } -// { dg-xfail-if "INFINITE" { "*-*-*" } { "-fpph-map=pph.map" } } // { dg-options "-w -fpermissive" } +// pph asm xdiff -#include "c2eabi1.h" +#include "c4eabi1.h" int main () { unsigned char bytes[256]; Index: gcc/testsuite/g++.dg/pph/a1dynarray-dcl4.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dcl4.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dcl4.hi (working copy) @@ -1,11 +0,0 @@ - typedef std::reverse_iterator<iterator> reverse_iterator; - typedef std::reverse_iterator<const_iterator> const_reverse_iterator; - - reverse_iterator rbegin() - { return reverse_iterator(end()); } - const_reverse_iterator rbegin() const - { return reverse_iterator(end()); } - reverse_iterator rend() - { return reverse_iterator(begin()); } - const_reverse_iterator rend() const - { return reverse_iterator(begin()); } Index: gcc/testsuite/g++.dg/pph/c1pr36533.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1pr36533.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1pr36533.h (working copy) @@ -1,176 +1,16 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H /* PR target/36533 */ /* { dg-options "-w -fpermissive" } */ + +#ifndef C1PR36533_H +#define C1PR36533_H + #include <string.h> #include <sys/mman.h> + #ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif -typedef struct S1 -{ - unsigned long s1; - struct S1 *s2; - char *s3; -} S1; - -typedef struct -{ - unsigned int s4; - unsigned int s5; - int s6; - unsigned int *s7; -} S2; - -typedef struct -{ - unsigned int s8; - unsigned short s9; - unsigned char s10; - unsigned char s11; - char s12[255]; -} S3; - -typedef struct -{ - unsigned int s4; - unsigned short s13; - unsigned short s14; -} S4; - -typedef struct -{ - char s15[16]; - unsigned long s16; -} S5; - -typedef struct -{ - char s15[48]; - S5 *s17; -} S6; - -typedef struct -{ - S1 *s18; -} S7; - -__attribute__((regparm (3), noinline)) int -fn1 (const char *x, void *y, S1 *z) -{ - asm volatile ("" : : : "memory"); - return *x + (y != 0); -} - -__attribute__((regparm (3), noinline)) int -fn2 (const char *x, int y, S2 *z) -{ - asm volatile ("" : : : "memory"); - return 0; -} - -static inline __attribute__ ((always_inline)) unsigned int -fn4 (unsigned short x) -{ - unsigned len = x; - if (len == ((1 << 16) - 1)) - return 1 << 16; - return len; -} - -static inline __attribute__ ((always_inline)) S3 * -fn3 (S3 *p) -{ - return (S3 *) ((char *) p + fn4 (p->s9)); -} - -__attribute__((regparm (3), noinline)) int -fn5 (void) -{ - asm volatile ("" : : : "memory"); - return 0; -} - -static inline __attribute__ ((always_inline)) int -fn6 (S3 *w, int x, S2 *y, S4 *z) -{ - int a = 2; - char *b = (char *) w; - S2 c = *y; - - while ((char *) w < b + x - 2 * sizeof (S4)) - { - if (w->s10 && w->s8) - { - fn2 (w->s12, w->s10, &c); - z--; - z->s4 = c.s4; - z->s13 = (unsigned short) ((char *) w - b); - z->s14 = w->s9; - a++; - fn5 (); - } - - w = fn3 (w); - } - return a; -} - -__attribute__((regparm (3), noinline)) unsigned int -test (void *u, S6 *v, S1 **w, S7 *x, S2 *y, S1 *z) -{ - unsigned b = v->s17->s16; - unsigned a; - S4 *c; - unsigned d, e, f, i; - - fn1 (__func__, u, x->s18); - c = (S4 *) (z->s3 + b); - a = fn6 ((S3 *) (*w)->s3, b, y, c); - c -= a; - f = 0; - e = 2; - for (i = a - 1; ; i--) - { - if (f + (unsigned short) (c[i].s14 / 2) > b / 2) - break; - f += c[i].s14; - e++; - } - d = a - e; - return c[d].s4; -} +#include "a0pr36533.h" -int main (void) -{ - char *p = mmap (NULL, 131072, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - S1 wb, z, *w; - S6 v; - S7 x; - S2 y; - S5 vb; - S4 s4; - if (p == MAP_FAILED) - return 0; - if (munmap (p + 65536, 65536) < 0) - return 0; - memset (&wb, 0, sizeof (wb)); - memset (&z, 0, sizeof (z)); - memset (&v, 0, sizeof (v)); - memset (&x, 0, sizeof (x)); - memset (&y, 0, sizeof (y)); - memset (&vb, 0, sizeof (vb)); - memset (&s4, 0, sizeof (s4)); - s4.s14 = 254; - z.s3 = p + 65536 - 2 * sizeof (S4); - w = &wb; - v.s17 = &vb; - vb.s16 = 2 * sizeof (S4); - memcpy (z.s3, &s4, sizeof (s4)); - memcpy (z.s3 + sizeof (s4), &s4, sizeof (s4)); - test ((void *) 0, &v, &w, &x, &y, &z); - return 0; -} #endif Index: gcc/testsuite/g++.dg/pph/c2builtin2.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c2builtin2.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2builtin2.cc (working copy) @@ -1,3 +0,0 @@ -#include "a2builtin4.h" -#include "c2builtin5.h" -#include "c2builtin6.h" Index: gcc/testsuite/g++.dg/pph/c2builtin3.h =================================================================== --- gcc/testsuite/g++.dg/pph/c2builtin3.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2builtin3.h (working copy) @@ -1,6 +0,0 @@ -#ifndef C2BUILTIN3_H -#define C2BUILTIN3_H -#include "c2builtin1.h" -const char *refile = VALUE(__FILE__); -const char *reline = VALUE(__LINE__); -#endif Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn2c.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn2c.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn2c.hi (working copy) @@ -1,11 +0,0 @@ -template< typename T > -dynarray<T>::dynarray(const dynarray& d) -: store( alloc( d.count ) ), count( d.count ) -{ - try { - std::uninitialized_copy( d.begin(), d.end(), begin() ); - } - catch ( ... ) { - delete store; throw; - } -} Index: gcc/testsuite/g++.dg/pph/c0altinc1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0altinc1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0altinc1.h (working copy) @@ -1,4 +1,4 @@ -#ifndef C1ALTINC1_H -#define C1ALTINC1_H +#ifndef C0ALTINC1_H +#define C0ALTINC1_H extern float f1; #endif Index: gcc/testsuite/g++.dg/pph/c0builtin5.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0builtin5.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0builtin5.h (working copy) @@ -1,6 +1,6 @@ -#ifndef C2BUILTIN5_H -#define C2BUILTIN5_H -#include "a2builtin4.h" +#ifndef C0BUILTIN5_H +#define C0BUILTIN5_H +#include "a0builtin4.h" const char *file = VALUE(__FILE__); const char *line = VALUE(__LINE__); const char *vers = VALUE(__cplusplus); Index: gcc/testsuite/g++.dg/pph/x1dynarray1.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray1.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray1.cc (working copy) @@ -1,15 +1,15 @@ // { dg-do run } // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } -#include "x1dynarray1.h" +#include "x0dynarray1.h" typedef int integer; typedef dynarray< integer > integer_array; int main() { - #include "a1dynarray-use1.cci" - #include "a1dynarray-use2.cci" - #include "a1dynarray-use4a.cci" + #include "a0dynarray-use1.cci" + #include "a0dynarray-use2.cci" + #include "a0dynarray-use4a.cci" return sum - 25; } Index: gcc/testsuite/g++.dg/pph/c1guarded3.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1guarded3.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1guarded3.h (working copy) @@ -1,5 +1,5 @@ #ifndef C1GUARDED3_H #define C1GUARDED3_H -#include "c1guarded1.h" +#include "c0guarded1.h" type variable3; #endif Index: gcc/testsuite/g++.dg/pph/c2dupguard2.h =================================================================== --- gcc/testsuite/g++.dg/pph/c2dupguard2.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2dupguard2.h (working copy) @@ -1,4 +0,0 @@ -#ifndef C2DUPGUARD_H -#define C2DUPGUARD_H -extern int x; -#endif Index: gcc/testsuite/g++.dg/pph/x1dynarray5.h =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray5.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray5.h (working copy) @@ -1,17 +0,0 @@ -#ifndef X1DYNARRAY5_H -#define X1DYNARRAY5_H - -#include "x1dynarray4.h" - -#include <new> -#include <memory> - -namespace tst { - -#include "a1dynarray-dfn1b.hi" -#include "a1dynarray-dfn2c.hi" -#include "a1dynarray-dfn3b.hi" - -} // namespace tst - -#endif Index: gcc/testsuite/g++.dg/pph/c2meteor-contest.cc =================================================================== --- gcc/testsuite/g++.dg/pph/c2meteor-contest.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/c2meteor-contest.cc (working copy) @@ -1,18 +0,0 @@ -/* { dg-options "-w" } */ - -// pph asm xdiff - -#include "c2meteor-contest.h" - -int main(int argc, char **argv) { - if(argc > 1) - max_solutions = atoi(argv[1]); - calc_pieces(); - calc_rows(); - solve(0, 0); - printf("%d solutions found\n\n", solution_count); - qsort(solutions, solution_count, 50 * sizeof(signed char), solution_sort); - pretty(solutions[0]); - pretty(solutions[solution_count-1]); - return 0; -} Index: gcc/testsuite/g++.dg/pph/x5dynarray7.h =================================================================== --- gcc/testsuite/g++.dg/pph/x5dynarray7.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x5dynarray7.h (working copy) @@ -3,8 +3,8 @@ // { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } // { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } -#ifndef X1DYNARRAY7_H -#define X1DYNARRAY7_H +#ifndef X5DYNARRAY7_H +#define X5DYNARRAY7_H #include <stddef.h> #include <new> @@ -17,15 +17,15 @@ namespace tst { template< typename T > struct dynarray { - #include "a1dynarray-dcl1.hi" - #include "a1dynarray-dcl2b.hi" - #include "a1dynarray-dcl3.hi" - #include "a1dynarray-dcl4.hi" + #include "a0dynarray-dcl1.hi" + #include "a0dynarray-dcl2b.hi" + #include "a0dynarray-dcl3.hi" + #include "a0dynarray-dcl4.hi" }; -#include "a1dynarray-dfn1b.hi" -#include "a1dynarray-dfn2c.hi" -#include "a1dynarray-dfn3c.hi" +#include "a0dynarray-dfn1b.hi" +#include "a0dynarray-dfn2c.hi" +#include "a0dynarray-dfn3c.hi" } // namespace tst Index: gcc/testsuite/g++.dg/pph/c0funcmac.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0funcmac.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0funcmac.h (working copy) @@ -1,5 +1,5 @@ -#ifndef C1FUNCMAC_H -#define C1FUNCMAC_H +#ifndef C0FUNCMAC_H +#define C0FUNCMAC_H #define gnu_dev_major(dev) long dev #define gnu_dev_minor(dev) short dev #define major(dev) gnu_dev_major (dev) Index: gcc/testsuite/g++.dg/pph/c0-20060625-1.h =================================================================== --- gcc/testsuite/g++.dg/pph/c0-20060625-1.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/c0-20060625-1.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H +#ifndef C0_20060625_1_H +#define C0_20060625_1_H /* PR middle-end/28151 */ /* Testcase by Steven Bosscher <stevenb.gcc@gmail.com> */ Index: gcc/testsuite/g++.dg/pph/a1dynarray-dcl2b.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dcl2b.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dcl2b.hi (working copy) @@ -1,3 +0,0 @@ - // system-based types: - typedef size_t size_type; - typedef ptrdiff_t difference_type; Index: gcc/testsuite/g++.dg/pph/x0struct0.h =================================================================== --- gcc/testsuite/g++.dg/pph/x0struct0.h (revision 176055) +++ gcc/testsuite/g++.dg/pph/x0struct0.h (working copy) @@ -1,5 +1,5 @@ -#ifndef X1STRUCT0_H -#define X1STRUCT0_H +#ifndef X0STRUCT0_H +#define X0STRUCT0_H typedef int type; struct B { }; Index: gcc/testsuite/g++.dg/pph/a1dynarray-dfn3b.hi =================================================================== --- gcc/testsuite/g++.dg/pph/a1dynarray-dfn3b.hi (revision 176187) +++ gcc/testsuite/g++.dg/pph/a1dynarray-dfn3b.hi (working copy) @@ -1,3 +0,0 @@ -template< typename T > -void dynarray<T>::check(size_type n) -{ if ( n >= count ) throw n; } Index: gcc/testsuite/g++.dg/pph/x1variables.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1variables.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1variables.cc (working copy) @@ -1,5 +0,0 @@ -#include "x1variables.h" - -int D::mbr_init_plain = 4; -int D::mbr_uninit_plain; -const int D::mbr_init_const = 5; Index: gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.h (working copy) @@ -1,189 +0,0 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H -/* { dg-options "-w" } */ - -#define WUR __attribute__((warn_unused_result)) -#define WURAI __attribute__((warn_unused_result, always_inline)) inline -typedef WUR int (*fnt) (void); - -typedef struct { long i; } A; -typedef struct { long i; long j; } B; -typedef struct { char big[1024]; fnt fn; } C; - -WUR int check1 (void); -WUR void check2 (void); -int foo WUR; -int bar (void); -extern WURAI int check3 (void) { return bar (); } -WUR A check4 (void); -WUR B check5 (void); -WUR C check6 (void); -A bar7 (void); -B bar8 (void); -C bar9 (void); -extern WURAI A check7 (void) { return bar7 (); } -extern WURAI B check8 (void) { return bar8 (); } -extern WURAI C check9 (void) { return bar9 (); } -/* This is useful for checking whether return value of statement - expressions (returning int in this case) is used. */ -extern WURAI int check_int_result (int res) { return res; } -#define GU(v) ({ int e = 0; (v) = bar (); if ((v) < 23) e = 14; e; }) -fnt fnptr; -WUR int check10 (void); -int baz (void); -extern WURAI int check11 (void) { return baz (); } -int k; - -void -test (void) -{ - int i = 0, j; - const fnt pcheck1 = check1; - const fnt pcheck3 = check3; - A a; - B b; - C c; - if (check1 ()) - return; - i += check1 (); - i += ({ check1 (); }); - check1 (); - (void) check1 (); - check1 (), bar (); - check2 (); - (void) check2 (); - check2 (), bar (); - if (check3 ()) - return; - i += check3 (); - i += ({ check3 (); }); - check3 (); - (void) check3 (); - check3 (), bar (); - a = check4 (); - if (a.i) - return; - if (check4 ().i) - return; - if (({ check4 (); }).i) - return; - check4 (); - (void) check4 (); - check4 (), bar (); - b = check5 (); - if (b.i + b.j) - return; - if (check5 ().j) - return; - if (({ check5 (); }).j) - return; - check5 (); - (void) check5 (); - check5 (), bar (); - c = check6 (); - if (c.big[12] + c.big[29]) - return; - if (check6 ().big[27]) - return; - if (({ check6 (); }).big[0]) - return; - check6 (); - (void) check6 (); - check6 (), bar (); - a = check7 (); - if (a.i) - return; - if (check7 ().i) - return; - if (({ check7 (); }).i) - return; - check7 (); - (void) check7 (); - check7 (), bar (); - b = check8 (); - if (b.i + b.j) - return; - if (check8 ().j) - return; - if (({ check8 (); }).j) - return; - check8 (); - (void) check8 (); - check8 (), bar (); - c = check9 (); - if (c.big[12] + c.big[29]) - return; - if (check9 ().big[27]) - return; - if (({ check9 (); }).big[0]) - return; - check9 (); - (void) check9 (); - check9 (), bar (); - if (check_int_result (GU (j))) - return; - i += check_int_result (GU (j)); - i += ({ check_int_result (GU (j)); }); - check_int_result (GU (j)); - (void) check_int_result (GU (j)); - check_int_result (GU (j)), bar (); - if (fnptr ()) - return; - i += fnptr (); - i += ({ fnptr (); }); - fnptr (); - (void) fnptr (); - fnptr (), bar (); - fnptr = check1; - if (fnptr ()) - return; - i += fnptr (); - i += ({ fnptr (); }); - fnptr (); - (void) fnptr (); - fnptr (), bar (); - fnptr = check3; - if (fnptr ()) - return; - i += fnptr (); - i += ({ fnptr (); }); - fnptr (); - (void) fnptr (); - fnptr (), bar (); - if (bar9 ().fn ()) - return; - i += bar9 ().fn (); - i += ({ bar9 ().fn (); }); - bar9 ().fn (); - (void) bar9 ().fn (); - bar9 ().fn (), bar (); - if ((k ? check1 : check10) ()) - return; - i += (k ? check1 : check10) (); - i += ({ (k ? check1 : check10) (); }); - (k ? check1 : check10) (); - (void) (k ? check1 : check10) (); - (k ? check1 : check10) (), bar (); - if ((k ? check3 : check11) ()) - return; - i += (k ? check3 : check11) (); - i += ({ (k ? check3 : check11) (); }); - (k ? check3 : check11) (); - (void) (k ? check3 : check11) (); - (k ? check3 : check11) (), bar (); - if (pcheck1 ()) - return; - i += pcheck1 (); - i += ({ pcheck1 (); }); - pcheck1 (); - (void) pcheck1 (); - pcheck1 (), bar (); - if (pcheck3 ()) - return; - i += pcheck3 (); - i += ({ pcheck3 (); }); - pcheck3 (); - (void) pcheck3 (); - pcheck3 (), bar (); -} -#endif Index: gcc/testsuite/g++.dg/pph/c1pr44948-1a.h =================================================================== --- gcc/testsuite/g++.dg/pph/c1pr44948-1a.h (revision 176187) +++ gcc/testsuite/g++.dg/pph/c1pr44948-1a.h (working copy) @@ -1,18 +0,0 @@ -#ifndef __PPH_GUARD_H -#define __PPH_GUARD_H -/* PR target/44948 */ -/* { dg-options "-O -Wno-psabi -mtune=generic" } */ - -#pragma GCC target ("avx") - -struct A { long b[8] __attribute__((aligned (32))); }; -void foo (long double, struct A); - -int -main (void) -{ - struct A a = { { 0, 1, 2, 3, 4, 5, 6, 7 } }; - foo (8.0L, a); - return 0; -} -#endif Index: gcc/testsuite/g++.dg/pph/x1dynarray2b.cc =================================================================== --- gcc/testsuite/g++.dg/pph/x1dynarray2b.cc (revision 176187) +++ gcc/testsuite/g++.dg/pph/x1dynarray2b.cc (working copy) @@ -1,14 +1,14 @@ // { dg-do run } -#include "x1dynarray2.h" +#include "x0dynarray2.h" typedef int integer; typedef tst::dynarray< integer > integer_array; int main() { - #include "a1dynarray-use1.cci" - #include "a1dynarray-use2.cci" - #include "a1dynarray-use4a.cci" + #include "a0dynarray-use1.cci" + #include "a0dynarray-use2.cci" + #include "a0dynarray-use4a.cci" return sum - 25; }

[pph] Rename tests according to PPH include level. (issue4678051)

Commit Message

Comments

Patch