Ignore:
Timestamp:
2011-06-01T08:43:42Z (14 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8d6c1f1
Parents:
9e2e715 (diff), e51a514 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Huuuuuge merge from development - all the work actually :)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ppc32/include/exception.h

    r9e2e715 reb522e8  
    9898}
    9999
    100 NO_TRACE static inline unative_t istate_get_pc(istate_t *istate)
     100NO_TRACE static inline sysarg_t istate_get_pc(istate_t *istate)
    101101{
    102102        return istate->pc;
    103103}
    104104
    105 NO_TRACE static inline unative_t istate_get_fp(istate_t *istate)
     105NO_TRACE static inline sysarg_t istate_get_fp(istate_t *istate)
    106106{
    107107        return istate->sp;
Note: See TracChangeset for help on using the changeset viewer.