Changeset d23c44d5 in rtems


Ignore:
Timestamp:
May 1, 2013, 12:14:48 AM (6 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master
Children:
77ebea3
Parents:
5aa4ed9
git-author:
Joel Sherrill <joel.sherrill@…> (05/01/13 00:14:48)
git-committer:
Joel Sherrill <joel.sherrill@…> (05/01/13 15:13:08)
Message:

score/cpu/.../i386.h: PR2020: Remove soft float references

i386 soft-float is no longer supported by gcc. Dropping
related code in the i386 score/cpu code.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/score/cpu/i386/rtems/score/i386.h

    r5aa4ed9 rd23c44d5  
    11/**
    22 * @file
    3  * 
     3 *
    44 * @brief Intel I386 CPU Dependent Source
    5  * 
     5 *
    66 * This include file contains information pertaining to the Intel
    77 * i386 processor.
     
    99
    1010/*
    11  *  COPYRIGHT (c) 1989-1999.
     11 *  COPYRIGHT (c) 1989-2013.
    1212 *  On-Line Applications Research Corporation (OAR).
    1313 *
     
    3434 *  Currently recognized:
    3535 *    i386_fp    (i386 DX or SX w/i387)
    36  *    i386_nofp  (i386 DX or SX w/o i387)
    3736 *    i486dx
    38  *    i486sx
    3937 *    pentium
    4038 *    pentiumpro
     
    4745 *
    4846 *  I386_HAS_FPU:    Defined to "1" if the CPU has an FPU.
    49  *
    50  */
    51 
    52 #if defined(_SOFT_FLOAT)
    53 #define I386_HAS_FPU 0
     47 *                   As of at least gcc 4.7, i386 soft-float was obsoleted.
     48 *                   Thus this is always set to "1".
     49 */
     50#define I386_HAS_FPU 1
     51
     52#if defined(__pentiumpro__)
     53
     54  #define CPU_MODEL_NAME  "Pentium Pro"
     55
     56#elif defined(__i586__)
     57
     58  #if defined(__pentium__)
     59    #define CPU_MODEL_NAME "Pentium"
     60  #elif defined(__k6__)
     61    #define CPU_MODEL_NAME "K6"
     62  #else
     63    #define CPU_MODEL_NAME "i586"
     64  #endif
     65
     66#elif defined(__i486__)
     67
     68  #define CPU_MODEL_NAME  "i486dx"
     69
     70#elif defined(__i386__)
     71
     72  #define I386_HAS_BSWAP  0
     73  #define CPU_MODEL_NAME  "i386 with i387"
     74
    5475#else
    55 #define I386_HAS_FPU 1
    56 #endif
    57 
    58 #if defined(__pentiumpro__)
    59 
    60 #define CPU_MODEL_NAME  "Pentium Pro"
    61 
    62 #elif defined(__i586__)
    63 
    64 # if defined(__pentium__)
    65 # define CPU_MODEL_NAME  "Pentium"
    66 # elif defined(__k6__)
    67 # define CPU_MODEL_NAME "K6"
    68 # else
    69 # define CPU_MODEL_NAME "i586"
    70 # endif
    71 
    72 #elif defined(__i486__)
    73 
    74 # if !defined(_SOFT_FLOAT)
    75 # define CPU_MODEL_NAME  "i486dx"
    76 # else
    77 # define CPU_MODEL_NAME  "i486sx"
    78 # endif
    79 
    80 #elif defined(__i386__)
    81 
    82 #define I386_HAS_BSWAP  0
    83 
    84 # if !defined(_SOFT_FLOAT)
    85 # define CPU_MODEL_NAME "i386 with i387"
    86 # else
    87 # define CPU_MODEL_NAME "i386 w/o i387"
    88 # endif
    89 
    90 #else
    91 #error "Unknown CPU Model"
     76  #error "Unknown CPU Model"
    9277#endif
    9378
     
    9782 *  NOTE: These settings are chosen to reflect most of the family members.
    9883 */
    99 
    100 #ifndef I386_HAS_FPU
    101 #define I386_HAS_FPU 1
    102 #endif
    103 
    10484#ifndef I386_HAS_BSWAP
    10585#define I386_HAS_BSWAP 1
     
    10989 *  Define the name of the CPU family.
    11090 */
    111 
    11291#define CPU_NAME "Intel i386"
    11392
     
    139118)
    140119{
    141     unsigned short      sout;
    142 
    143     __asm__ volatile( "rorw $8,%0" : "=r"  (sout) : "0"   (value));
    144     return (sout);
    145 }
    146 
     120  unsigned short      sout;
     121
     122  __asm__ volatile( "rorw $8,%0" : "=r"  (sout) : "0"   (value));
     123  return (sout);
     124}
    147125
    148126/*
    149127 * Added for pagination management
    150128 */
    151 
    152129static inline unsigned int i386_get_cr0(void)
    153130{
     
    194171 *  Converts logical address to physical address.
    195172 */
    196 
    197173void *i386_Logical_to_physical(
    198174  unsigned short  segment,
     
    205181 *  Converts physical address to logical address.
    206182 */
    207 
    208183void *i386_Physical_to_logical(
    209184  unsigned short  segment,
    210185  void           *address
    211186);
    212 
    213187
    214188/*
Note: See TracChangeset for help on using the changeset viewer.