Changeset 139ec149 in rtems


Ignore:
Timestamp:
Feb 11, 2011, 9:32:25 AM (9 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.11, master
Children:
682a05b3
Parents:
f7e5fb5
Message:

2011-02-11 Ralf Corsépius <ralf.corsepius@…>

  • pxa255/pmc/pmc.c, shared/include/arm-cp15.h: Use "asm" instead of "asm" for improved c99-compliance.
Location:
c/src/lib/libcpu/arm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libcpu/arm/ChangeLog

    rf7e5fb5 r139ec149  
     12011-02-11      Ralf Corsépius <ralf.corsepius@rtems.org>
     2
     3        * pxa255/pmc/pmc.c, shared/include/arm-cp15.h:
     4        Use "__asm__" instead of "asm" for improved c99-compliance.
     5
    162011-02-02      Ralf Corsépius <ralf.corsepius@rtems.org>
    27
  • c/src/lib/libcpu/arm/pxa255/pmc/pmc.c

    rf7e5fb5 r139ec149  
    1818  switch(reg){
    1919  case PMC_PMNC:
    20     asm volatile("mrc p14,0,%0,c0,c1,0\n":"=r"(val):);
     20    __asm__ volatile("mrc p14,0,%0,c0,c1,0\n":"=r"(val):);
    2121    break;
    2222  case PMC_CCNT:
    23     asm volatile("mrc p14,0,%0,c1,c1,0\n":"=r"(val):);
     23    __asm__ volatile("mrc p14,0,%0,c1,c1,0\n":"=r"(val):);
    2424    break;
    2525  case PMC_INTEN:
    26     asm volatile("mrc p14,0,%0,c4,c1,0\n":"=r"(val):);
     26    __asm__ volatile("mrc p14,0,%0,c4,c1,0\n":"=r"(val):);
    2727    break;
    2828  case PMC_FLAG:
    29     asm volatile("mrc p14,0,%0,c5,c1,0\n":"=r"(val):);
     29    __asm__ volatile("mrc p14,0,%0,c5,c1,0\n":"=r"(val):);
    3030    break;
    3131  case PMC_EVTSEL:
    32     asm volatile("mrc p14,0,%0,c8,c1,0\n":"=r"(val):);
     32    __asm__ volatile("mrc p14,0,%0,c8,c1,0\n":"=r"(val):);
    3333    break;
    3434  case PMC_PMN0:
    35     asm volatile("mrc p14,0,%0,c0,c2,0\n":"=r"(val):);
     35    __asm__ volatile("mrc p14,0,%0,c0,c2,0\n":"=r"(val):);
    3636    break;
    3737  case PMC_PMN1:
    38     asm volatile("mrc p14,0,%0,c1,c2,0\n":"=r"(val):);
     38    __asm__ volatile("mrc p14,0,%0,c1,c2,0\n":"=r"(val):);
    3939    break;
    4040  case PMC_PMN2:
    41     asm volatile("mrc p14,0,%0,c2,c2,0\n":"=r"(val):);
     41    __asm__ volatile("mrc p14,0,%0,c2,c2,0\n":"=r"(val):);
    4242    break;
    4343  case PMC_PMN3:
    44     asm volatile("mrc p14,0,%0,c3,c2,0\n":"=r"(val):);
     44    __asm__ volatile("mrc p14,0,%0,c3,c2,0\n":"=r"(val):);
    4545    break;
    4646  default:
     
    5555  switch(reg){
    5656  case PMC_PMNC:
    57     asm volatile("mcr p14,0,%0,c0,c1,0\n"::"r"(val));
     57    __asm__ volatile("mcr p14,0,%0,c0,c1,0\n"::"r"(val));
    5858    break;
    5959  case PMC_CCNT:
    60     asm volatile("mcr p14,0,%0,c1,c1,0\n"::"r"(val));
     60    __asm__ volatile("mcr p14,0,%0,c1,c1,0\n"::"r"(val));
    6161    break;
    6262  case PMC_INTEN:
    63     asm volatile("mcr p14,0,%0,c4,c1,0\n"::"r"(val));
     63    __asm__ volatile("mcr p14,0,%0,c4,c1,0\n"::"r"(val));
    6464    break;
    6565  case PMC_FLAG:
    66     asm volatile("mcr p14,0,%0,c5,c1,0\n"::"r"(val));
     66    __asm__ volatile("mcr p14,0,%0,c5,c1,0\n"::"r"(val));
    6767    break;
    6868  case PMC_EVTSEL:
    69     asm volatile("mcr p14,0,%0,c8,c1,0\n"::"r"(val));
     69    __asm__ volatile("mcr p14,0,%0,c8,c1,0\n"::"r"(val));
    7070    break;
    7171  case PMC_PMN0:
    72     asm volatile("mcr p14,0,%0,c0,c2,0\n"::"r"(val));
     72    __asm__ volatile("mcr p14,0,%0,c0,c2,0\n"::"r"(val));
    7373    break;
    7474  case PMC_PMN1:
    75     asm volatile("mcr p14,0,%0,c1,c2,0\n"::"r"(val));
     75    __asm__ volatile("mcr p14,0,%0,c1,c2,0\n"::"r"(val));
    7676    break;
    7777  case PMC_PMN2:
    78     asm volatile("mcr p14,0,%0,c2,c2,0\n"::"r"(val));
     78    __asm__ volatile("mcr p14,0,%0,c2,c2,0\n"::"r"(val));
    7979    break;
    8080  case PMC_PMN3:
    81     asm volatile("mcr p14,0,%0,c3,c2,0\n"::"r"(val));
     81    __asm__ volatile("mcr p14,0,%0,c3,c2,0\n"::"r"(val));
    8282    break;
    8383  default:
  • c/src/lib/libcpu/arm/shared/include/arm-cp15.h

    rf7e5fb5 r139ec149  
    110110  uint32_t val;
    111111
    112   asm volatile (
     112  __asm__ volatile (
    113113    ARM_SWITCH_TO_ARM
    114114    "mrc p15, 0, %[val], c0, c0, 0\n"
     
    125125  uint32_t val;
    126126
    127   asm volatile (
     127  __asm__ volatile (
    128128    ARM_SWITCH_TO_ARM
    129129    "mrc p15, 0, %[val], c0, c0, 2\n"
     
    140140  uint32_t val;
    141141
    142   asm volatile (
     142  __asm__ volatile (
    143143    ARM_SWITCH_TO_ARM
    144144    "mrc p15, 0, %[val], c1, c0, 0\n"
     
    154154  ARM_SWITCH_REGISTERS;
    155155
    156   asm volatile (
     156  __asm__ volatile (
    157157    ARM_SWITCH_TO_ARM
    158158    "mcr p15, 0, %[val], c1, c0, 0\n"
     
    177177  uint32_t *base;
    178178
    179   asm volatile (
     179  __asm__ volatile (
    180180    ARM_SWITCH_TO_ARM
    181181    "mrc p15, 0, %[base], c2, c0, 0\n"
     
    191191  ARM_SWITCH_REGISTERS;
    192192
    193   asm volatile (
     193  __asm__ volatile (
    194194    ARM_SWITCH_TO_ARM
    195195    "mcr p15, 0, %[base], c2, c0, 0\n"
     
    205205  uint32_t val;
    206206
    207   asm volatile (
     207  __asm__ volatile (
    208208    ARM_SWITCH_TO_ARM
    209209    "mrc p15, 0, %[val], c3, c0, 0\n"
     
    219219  ARM_SWITCH_REGISTERS;
    220220
    221   asm volatile (
     221  __asm__ volatile (
    222222    ARM_SWITCH_TO_ARM
    223223    "mcr p15, 0, %[val], c3, c0, 0\n"
     
    233233  uint32_t val;
    234234
    235   asm volatile (
     235  __asm__ volatile (
    236236    ARM_SWITCH_TO_ARM
    237237    "mrc p15, 0, %[val], c5, c0, 0\n"
     
    247247  ARM_SWITCH_REGISTERS;
    248248
    249   asm volatile (
     249  __asm__ volatile (
    250250    ARM_SWITCH_TO_ARM
    251251    "mcr p15, 0, %[val], c5, c0, 0\n"
     
    261261  uint32_t val;
    262262
    263   asm volatile (
     263  __asm__ volatile (
    264264    ARM_SWITCH_TO_ARM
    265265    "mrc p15, 0, %[val], c5, c0, 1\n"
     
    275275  ARM_SWITCH_REGISTERS;
    276276
    277   asm volatile (
     277  __asm__ volatile (
    278278    ARM_SWITCH_TO_ARM
    279279    "mcr p15, 0, %[val], c5, c0, 1\n"
     
    289289  void *mva;
    290290
    291   asm volatile (
     291  __asm__ volatile (
    292292    ARM_SWITCH_TO_ARM
    293293    "mrc p15, 0, %[mva], c6, c0, 0\n"
     
    303303  ARM_SWITCH_REGISTERS;
    304304
    305   asm volatile (
     305  __asm__ volatile (
    306306    ARM_SWITCH_TO_ARM
    307307    "mcr p15, 0, %[mva], c6, c0, 0\n"
     
    317317  uint32_t sbz = 0;
    318318
    319   asm volatile (
     319  __asm__ volatile (
    320320    ARM_SWITCH_TO_ARM
    321321    "mcr p15, 0, %[sbz], c8, c7, 0\n"
     
    332332  mva = ARM_CP15_TLB_PREPARE_MVA(mva);
    333333
    334   asm volatile (
     334  __asm__ volatile (
    335335    ARM_SWITCH_TO_ARM
    336336    "mcr p15, 0, %[mva], c8, c7, 1\n"
     
    346346  uint32_t sbz = 0;
    347347
    348   asm volatile (
     348  __asm__ volatile (
    349349    ARM_SWITCH_TO_ARM
    350350    "mcr p15, 0, %[sbz], c8, c5, 0\n"
     
    361361  mva = ARM_CP15_TLB_PREPARE_MVA(mva);
    362362
    363   asm volatile (
     363  __asm__ volatile (
    364364    ARM_SWITCH_TO_ARM
    365365    "mcr p15, 0, %[mva], c8, c5, 1\n"
     
    375375  uint32_t sbz = 0;
    376376
    377   asm volatile (
     377  __asm__ volatile (
    378378    ARM_SWITCH_TO_ARM
    379379    "mcr p15, 0, %[sbz], c8, c6, 0\n"
     
    390390  mva = ARM_CP15_TLB_PREPARE_MVA(mva);
    391391
    392   asm volatile (
     392  __asm__ volatile (
    393393    ARM_SWITCH_TO_ARM
    394394    "mcr p15, 0, %[mva], c8, c6, 1\n"
     
    403403  uint32_t arm_switch_reg;
    404404
    405   asm volatile (
     405  __asm__ volatile (
    406406    ARM_SWITCH_TO_ARM
    407407    "add %[arm_switch_reg], pc, #16\n"
     
    434434  uint32_t val;
    435435
    436   asm volatile (
     436  __asm__ volatile (
    437437    ARM_SWITCH_TO_ARM
    438438    "mrc p15, 0, %[val], c0, c0, 1\n"
     
    449449  uint32_t sbz = 0;
    450450
    451   asm volatile (
     451  __asm__ volatile (
    452452    ARM_SWITCH_TO_ARM
    453453    "mcr p15, 0, %[sbz], c7, c7, 0\n"
     
    464464  uint32_t sbz = 0;
    465465
    466   asm volatile (
     466  __asm__ volatile (
    467467    ARM_SWITCH_TO_ARM
    468468    "mcr p15, 0, %[sbz], c7, c5, 0\n"
     
    480480  mva = ARM_CP15_CACHE_PREPARE_MVA(mva);
    481481
    482   asm volatile (
     482  __asm__ volatile (
    483483    ARM_SWITCH_TO_ARM
    484484    "mcr p15, 0, %[mva], c7, c5, 1\n"
     
    494494  ARM_SWITCH_REGISTERS;
    495495
    496   asm volatile (
     496  __asm__ volatile (
    497497    ARM_SWITCH_TO_ARM
    498498    "mcr p15, 0, %[set_and_way], c7, c5, 2\n"
     
    510510  mva = ARM_CP15_CACHE_PREPARE_MVA(mva);
    511511
    512   asm volatile (
     512  __asm__ volatile (
    513513    ARM_SWITCH_TO_ARM
    514514    "mcr p15, 0, %[mva], c7, c13, 1\n"
     
    524524  uint32_t sbz = 0;
    525525
    526   asm volatile (
     526  __asm__ volatile (
    527527    ARM_SWITCH_TO_ARM
    528528    "mcr p15, 0, %[sbz], c7, c6, 0\n"
     
    540540  mva = ARM_CP15_CACHE_PREPARE_MVA(mva);
    541541
    542   asm volatile (
     542  __asm__ volatile (
    543543    ARM_SWITCH_TO_ARM
    544544    "mcr p15, 0, %[mva], c7, c6, 1\n"
     
    554554  ARM_SWITCH_REGISTERS;
    555555
    556   asm volatile (
     556  __asm__ volatile (
    557557    ARM_SWITCH_TO_ARM
    558558    "mcr p15, 0, %[set_and_way], c7, c6, 2\n"
     
    570570  mva = ARM_CP15_CACHE_PREPARE_MVA(mva);
    571571
    572   asm volatile (
     572  __asm__ volatile (
    573573    ARM_SWITCH_TO_ARM
    574574    "mcr p15, 0, %[mva], c7, c10, 1\n"
     
    584584  ARM_SWITCH_REGISTERS;
    585585
    586   asm volatile (
     586  __asm__ volatile (
    587587    ARM_SWITCH_TO_ARM
    588588    "mcr p15, 0, %[set_and_way], c7, c10, 2\n"
     
    598598  ARM_SWITCH_REGISTERS;
    599599
    600   asm volatile (
     600  __asm__ volatile (
    601601    ARM_SWITCH_TO_ARM
    602602    "1:\n"
     
    616616  mva = ARM_CP15_CACHE_PREPARE_MVA(mva);
    617617
    618   asm volatile (
     618  __asm__ volatile (
    619619    ARM_SWITCH_TO_ARM
    620620    "mcr p15, 0, %[mva], c7, c14, 1\n"
     
    630630  ARM_SWITCH_REGISTERS;
    631631
    632   asm volatile (
     632  __asm__ volatile (
    633633    ARM_SWITCH_TO_ARM
    634634    "mcr p15, 0, %[set_and_way], c7, c14, 2\n"
     
    644644  ARM_SWITCH_REGISTERS;
    645645
    646   asm volatile (
     646  __asm__ volatile (
    647647    ARM_SWITCH_TO_ARM
    648648    "1:\n"
     
    663663  uint32_t sbz = 0;
    664664
    665   asm volatile (
     665  __asm__ volatile (
    666666    ARM_SWITCH_TO_ARM
    667667    "mcr p15, 0, %[sbz], c7, c10, 4\n"
     
    678678  uint32_t sbz = 0;
    679679
    680   asm volatile (
     680  __asm__ volatile (
    681681    ARM_SWITCH_TO_ARM
    682682    "mcr p15, 0, %[sbz], c7, c0, 4\n"
Note: See TracChangeset for help on using the changeset viewer.