Re: Virtualize CFG manipulation functions...

[Jan Hubicka <hubicka at ucw dot cz>]

> >From what I can see it's reasonable.  You missed attaching
> your two new files though.  ;-)
These are not mine, but Pops :)
Attached.
Honza
> 
> 
> r~

/* Hooks for cfg representation specific functions.
   Copyright (C) 2003 Free Software Foundation, Inc.
   Contributed by Sebastian Pop <s.pop@laposte.net>

This file is part of GCC.

GCC is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.

GCC is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING.  If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.  */

#ifndef GCC_CFGHOOKS_H
#define GCC_CFGHOOKS_H

struct cfg_hooks
{
  /* Debugging.  Do not use macros to hook these so they can be called from
     debugger!  */
  void (*cfgh_verify_flow_info)	        PARAMS ((void));

  /* Basic CFG manipulation.  */

  /* Redirect edge E to the given basic block B and update underlying program
     representation.  Returns false when edge is not easilly redirectable for
     whatever reason.  */
  bool (*redirect_edge_and_branch)      PARAMS ((edge e, basic_block b));

  /* Same as the above but allows redirecting of fallthru edges.  In that case
     newly created forwarder basic block is returned.  It aborts when called
     on abnormal edge.  */
  basic_block (*redirect_edge_and_branch_force)PARAMS ((edge, basic_block));

  /* Remove given basic block and all edges possibly pointing into it.  */
  void (*delete_block)PARAMS ((basic_block));

  /* Split basic block B after specified instruction I.  */
  edge (*split_block)			PARAMS ((basic_block b, void * i));

  /* Higher level functions representable by primitive operations above if
     we didn't have some oddities in RTL and Tree representations.  */
  basic_block (*cfgh_split_edge)        PARAMS ((edge));
};

#define redirect_edge_and_branch(e,b)        cfg_hooks->redirect_edge_and_branch (e,b)
#define redirect_edge_and_branch_force(e,b)  cfg_hooks->redirect_edge_and_branch_force (e,b)
#define split_block(e,i)                     cfg_hooks->split_block (e,i)
#define delete_block(b)			     cfg_hooks->delete_block (b)
#define split_edge(e)                        cfg_hooks->cfgh_split_edge (e)

/* Hooks containers.  */
extern struct cfg_hooks rtl_cfg_hooks;

/* A pointer to one of the hooks containers.  */
extern struct cfg_hooks *cfg_hooks;

/* Declarations.  */
extern void rtl_register_cfg_hooks     PARAMS ((void));
extern void cfg_layout_rtl_register_cfg_hooks PARAMS ((void));

#endif  /* GCC_CFGHOOKS_H */

/* Hooks for cfg representation specific functions.
   Copyright (C) 2003 Free Software Foundation, Inc.
   Contributed by Sebastian Pop <s.pop@laposte.net>

This file is part of GCC.

GCC is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.

GCC is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING.  If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.  */

#include "config.h"
#include "system.h"
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
#include "rtl.h"
#include "basic-block.h"

extern struct cfg_hooks rtl_cfg_hooks;
extern struct cfg_hooks cfg_layout_rtl_cfg_hooks;

/* A pointer to one of the hooks containers.  */
struct cfg_hooks *cfg_hooks;

/* Initialization of functions specific to the rtl IR.  */
void 
rtl_register_cfg_hooks ()
{
  cfg_hooks = &rtl_cfg_hooks;
}

/* Initialization of functions specific to the rtl IR.  */
void 
cfg_layout_rtl_register_cfg_hooks ()
{
  cfg_hooks = &cfg_layout_rtl_cfg_hooks;
}