logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0003-Avoid-use-of-case-ranges.patch (2383B)

    

  1. From 8d660bf668aa05e9b5cf10f2fe6171c0462ad34d Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Mon, 6 Sep 2021 19:47:41 -0700
  4. Subject: [PATCH] Avoid use of case ranges
  6. ---
  7.  pci.c | 39 ++-------------------------------------
  8.  vga.c |  5 ++---
  9.  2 files changed, 4 insertions(+), 40 deletions(-)
  11. diff --git a/pci.c b/pci.c
  12. index d37b737..f0cf05b 100644
  13. --- a/pci.c
  14. +++ b/pci.c
  15. @@ -291,46 +291,11 @@ static void pci_device_config_write8(PCIDevice *d, uint32_t addr,
  16.      switch(d->config[0x0e]) {
  17.      case 0x00:
  18.      case 0x80:
  19. -        switch(addr) {
  20. -        case 0x00:
  21. -        case 0x01:
  22. -        case 0x02:
  23. -        case 0x03:
  24. -        case 0x08:
  25. -        case 0x09:
  26. -        case 0x0a:
  27. -        case 0x0b:
  28. -        case 0x0e:
  29. -        case 0x10 ... 0x27: /* base */
  30. -        case 0x30 ... 0x33: /* rom */
  31. -        case 0x3d:
  32. -            can_write = 0;
  33. -            break;
  34. -        default:
  35. -            can_write = 1;
  36. -            break;
  37. -        }
  38. +        can_write = addr >= 0x40 || 1ull << addr & 0xdff0ff000000b0f0;
  39.          break;
  40.      default:
  41.      case 0x01:
  42. -        switch(addr) {
  43. -        case 0x00:
  44. -        case 0x01:
  45. -        case 0x02:
  46. -        case 0x03:
  47. -        case 0x08:
  48. -        case 0x09:
  49. -        case 0x0a:
  50. -        case 0x0b:
  51. -        case 0x0e:
  52. -        case 0x38 ... 0x3b: /* rom */
  53. -        case 0x3d:
  54. -            can_write = 0;
  55. -            break;
  56. -        default:
  57. -            can_write = 1;
  58. -            break;
  59. -        }
  60. +        can_write = addr >= 0x40 || 1ull << addr & 0xd0ffffffffffb0f0;
  61.          break;
  62.      }
  63.      if (can_write)
  64. diff --git a/vga.c b/vga.c
  65. index 948d590..afe4c3f 100644
  66. --- a/vga.c
  67. +++ b/vga.c
  68. @@ -506,9 +506,6 @@ static void vga_ioport_write(VGAState *s, uint32_t addr, uint32_t val)
  69.          } else {
  70.              index = s->ar_index & 0x1f;
  71.              switch(index) {
  72. -            case 0x00 ... 0x0f:
  73. -                s->ar[index] = val & 0x3f;
  74. -                break;
  75.              case 0x10:
  76.                  s->ar[index] = val & ~0x10;
  77.                  break;
  78. @@ -525,6 +522,8 @@ static void vga_ioport_write(VGAState *s, uint32_t addr, uint32_t val)
  79.                  s->ar[index] = val & ~0xf0;
  80.                  break;
  81.              default:
  82. +                if (index <= 0x0f)
  83. +                    s->ar[index] = val & 0x3f;
  84.                  break;
  85.              }
  86.          }
  87. -- 
  88. 2.32.0