Changeset 16cc328 in rtems


Ignore:
Timestamp:
Jan 19, 2005, 9:27:39 PM (15 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
d873fd4
Parents:
adc829ed
Message:

2005-01-19 Joel Sherrill <joel@…>

  • pc386/console/vgainit.c, pc386/wd8003/wd8003.c, shared/comm/uart.c: Fix errors caught by gcc 4.x.
Location:
c/src/lib/libbsp/i386
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/i386/ChangeLog

    radc829ed r16cc328  
     12005-01-19      Joel Sherrill <joel@OARcorp.com>
     2
     3        * pc386/console/vgainit.c, pc386/wd8003/wd8003.c, shared/comm/uart.c:
     4        Fix errors caught by gcc 4.x.
     5
    162004-09-24      Ralf Corsepius <ralf_corsepius@rtems.org>
    27
  • c/src/lib/libbsp/i386/pc386/console/vgainit.c

    radc829ed r16cc328  
    171171/* VGA 800x600 16-color graphics (BIOS mode 0x29).
    172172 */
    173 static REGIO graphics_on[] = {
     173REGIO graphics_on[] = {
    174174  /* Reset attr F/F */
    175175  IN, ATTRREG, 0, 0, 0,
  • c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c

    radc829ed r16cc328  
    282282  unsigned int len;
    283283  volatile unsigned char start, next, current;
    284   char *shp, *temp;
     284  unsigned char *shp, *temp;
     285  unsigned short *real_short_ptr;
    285286  rtems_event_set events;
    286287
     
    309310        break;
    310311
     312      /* real_short_ptr avoids cast on lvalue which gcc no longer allows */
    311313      shp = dp->base + 1 + (SHAPAGE * start);
    312314      next = *shp++;
    313       len = *((short *)shp)++ - 4;
     315      real_short_ptr = (unsigned short *)shp;
     316      len = *(real_short_ptr)++ - 4;
    314317
    315318      if (next >= OUTPAGE){
  • c/src/lib/libbsp/i386/shared/comm/uart.c

    radc829ed r16cc328  
    832832
    833833/* ================= GDB support     ===================*/
    834 static int sav[4] __attribute__ ((unused));
     834int BSP_uart_dbgisr_com_regsav[4] __attribute__ ((unused));
    835835
    836836/*
     
    846846asm (".globl BSP_uart_dbgisr_com1");
    847847asm ("BSP_uart_dbgisr_com1:");
    848 asm ("    movl %eax, sav");          /* Save eax */
    849 asm ("    movl %ebx, sav + 4");      /* Save ebx */
    850 asm ("    movl %edx, sav + 8");      /* Save edx */
     848asm ("    movl %eax, BSP_uart_dbgisr_com_regsav");          /* Save eax */
     849asm ("    movl %ebx, BSP_uart_dbgisr_com_regsav + 4");      /* Save ebx */
     850asm ("    movl %edx, BSP_uart_dbgisr_com_regsav + 8");      /* Save edx */
    851851
    852852asm ("    movl $0, %ebx");           /* Clear flag */
     
    879879
    880880/* Flag is set */
    881 asm ("   movl sav+4, %ebx");     /* Restore ebx */
    882 asm ("   movl sav+8, %edx");     /* Restore edx */
     881asm ("   movl BSP_uart_dbgisr_com_regsav+4, %ebx");     /* Restore ebx */
     882asm ("   movl BSP_uart_dbgisr_com_regsav+8, %edx");     /* Restore edx */
    883883
    884884/* Set TF bit */
    885 asm ("   popl  %eax");           /* Pop eip */
    886 asm ("   movl  %eax, sav + 4");  /* Save it */
    887 asm ("   popl  %eax");           /* Pop cs */
    888 asm ("   movl  %eax, sav + 8");  /* Save it */
    889 asm ("   popl  %eax");           /* Pop flags */
    890 asm ("   orl   $0x100, %eax");   /* Modify it */
    891 asm ("   pushl %eax");           /* Push it back */
    892 asm ("   movl  sav+8, %eax");    /* Put back cs */
     885asm ("   popl  %eax");                                   /* Pop eip */
     886asm ("   movl  %eax, BSP_uart_dbgisr_com_regsav + 4");  /* Save it */
     887asm ("   popl  %eax");                                   /* Pop cs */
     888asm ("   movl  %eax, BSP_uart_dbgisr_com_regsav + 8");  /* Save it */
     889asm ("   popl  %eax");                                   /* Pop flags */
     890asm ("   orl   $0x100, %eax");                           /* Modify it */
     891asm ("   pushl %eax");                                   /* Push it back */
     892asm ("   movl  BSP_uart_dbgisr_com_regsav+8, %eax");    /* Put back cs */
    893893asm ("   pushl %eax");
    894 asm ("   movl  sav+4, %eax");    /* Put back eip */
     894asm ("   movl  BSP_uart_dbgisr_com_regsav+4, %eax");    /* Put back eip */
    895895asm ("   pushl %eax");
    896896
     
    898898asm ("   movb  $0x20, %al");
    899899asm ("   outb  %al, $0x20");
    900 asm ("   movl  sav, %eax");      /* Restore eax */
    901 asm ("   iret");                 /* Done */
     900asm ("   movl  BSP_uart_dbgisr_com_regsav, %eax");      /* Restore eax */
     901asm ("   iret");                                         /* Done */
    902902
    903903/* Flag is not set */
    904904asm("uart_dbgisr_com1_3:");
    905 asm ("   movl sav+4, %ebx");     /* Restore ebx */
    906 asm ("   movl sav+8, %edx");     /* Restore edx */
     905asm ("   movl BSP_uart_dbgisr_com_regsav+4, %ebx");     /* Restore ebx */
     906asm ("   movl BSP_uart_dbgisr_com_regsav+8, %edx");     /* Restore edx */
    907907
    908908/* Acknowledge irq */
    909909asm ("   movb  $0x20, %al");
    910910asm ("   outb  %al, $0x20");
    911 asm ("   movl  sav, %eax");      /* Restore eax */
     911asm ("   movl  BSP_uart_dbgisr_com_regsav, %eax");      /* Restore eax */
    912912asm ("   iret");                 /* Done */
    913913
     
    923923asm (".globl BSP_uart_dbgisr_com2");
    924924asm ("BSP_uart_dbgisr_com2:");
    925 asm ("    movl %eax, sav");          /* Save eax */
    926 asm ("    movl %ebx, sav + 4");      /* Save ebx */
    927 asm ("    movl %edx, sav + 8");      /* Save edx */
     925asm ("    movl %eax, BSP_uart_dbgisr_com_regsav");          /* Save eax */
     926asm ("    movl %ebx, BSP_uart_dbgisr_com_regsav + 4");      /* Save ebx */
     927asm ("    movl %edx, BSP_uart_dbgisr_com_regsav + 8");      /* Save edx */
    928928
    929929asm ("    movl $0, %ebx");           /* Clear flag */
     
    956956
    957957/* Flag is set */
    958 asm ("   movl sav+4, %ebx");     /* Restore ebx */
    959 asm ("   movl sav+8, %edx");     /* Restore edx */
     958asm ("   movl BSP_uart_dbgisr_com_regsav+4, %ebx");     /* Restore ebx */
     959asm ("   movl BSP_uart_dbgisr_com_regsav+8, %edx");     /* Restore edx */
    960960
    961961/* Set TF bit */
    962962asm ("   popl  %eax");           /* Pop eip */
    963 asm ("   movl  %eax, sav + 4");  /* Save it */
     963asm ("   movl  %eax, BSP_uart_dbgisr_com_regsav + 4");  /* Save it */
    964964asm ("   popl  %eax");           /* Pop cs */
    965 asm ("   movl  %eax, sav + 8");  /* Save it */
     965asm ("   movl  %eax, BSP_uart_dbgisr_com_regsav + 8");  /* Save it */
    966966asm ("   popl  %eax");           /* Pop flags */
    967967asm ("   orl   $0x100, %eax");   /* Modify it */
    968968asm ("   pushl %eax");           /* Push it back */
    969 asm ("   movl  sav+8, %eax");    /* Put back cs */
     969asm ("   movl  BSP_uart_dbgisr_com_regsav+8, %eax");    /* Put back cs */
    970970asm ("   pushl %eax");
    971 asm ("   movl  sav+4, %eax");    /* Put back eip */
     971asm ("   movl  BSP_uart_dbgisr_com_regsav+4, %eax");    /* Put back eip */
    972972asm ("   pushl %eax");
    973973
     
    975975asm ("   movb  $0x20, %al");
    976976asm ("   outb  %al, $0x20");
    977 asm ("   movl  sav, %eax");      /* Restore eax */
     977asm ("   movl  BSP_uart_dbgisr_com_regsav, %eax");      /* Restore eax */
    978978asm ("   iret");                 /* Done */
    979979
    980980/* Flag is not set */
    981981asm("uart_dbgisr_com2_3:");
    982 asm ("   movl sav+4, %ebx");     /* Restore ebx */
    983 asm ("   movl sav+8, %edx");     /* Restore edx */
     982asm ("   movl BSP_uart_dbgisr_com_regsav+4, %ebx");     /* Restore ebx */
     983asm ("   movl BSP_uart_dbgisr_com_regsav+8, %edx");     /* Restore edx */
    984984
    985985/* Acknowledge irq */
    986986asm ("   movb  $0x20, %al");
    987987asm ("   outb  %al, $0x20");
    988 asm ("   movl  sav, %eax");      /* Restore eax */
     988asm ("   movl  BSP_uart_dbgisr_com_regsav, %eax");      /* Restore eax */
    989989asm ("   iret");                 /* Done */
Note: See TracChangeset for help on using the changeset viewer.