消除所有warning

tiansongyu · tiansongyu · commit 852c75ce505d · 2022-01-06T11:41:44.000+08:00
diff --git a/6502/6502Lib/src/public/Bus.cpp b/6502/6502Lib/src/public/Bus.cpp
@@ -1,4 +1,4 @@
-// Copyright [2021] <tiansongyu>
+// Copyright [2020-2021] <tiansongyu>
 #include  "Bus.h"
 
 Bus::Bus() {
diff --git a/6502/6502Lib/src/public/Mapper.cpp b/6502/6502Lib/src/public/Mapper.cpp
@@ -1,3 +1,5 @@
+// Copyright [2020-2021] <tiansongyu>
+
 #include "Mapper.h"
 
 Mapper::Mapper(uint8_t prgBanks, uint8_t chrBanks) {
diff --git a/6502/6502Lib/src/public/Mapper.h b/6502/6502Lib/src/public/Mapper.h
@@ -1,3 +1,5 @@
+// Copyright [2020-2021] <tiansongyu>
+
 #pragma once
 #include <cstdint>
 
diff --git a/6502/6502Lib/src/public/Mapper_000.cpp b/6502/6502Lib/src/public/Mapper_000.cpp
@@ -1,3 +1,5 @@
+// Copyright [2021] <tiansongyu>
+
 #include "Mapper_000.h"
 
 Mapper_000::Mapper_000(uint8_t prgBanks, uint8_t chrBanks)
diff --git a/6502/6502Lib/src/public/Mapper_000.h b/6502/6502Lib/src/public/Mapper_000.h
@@ -1,4 +1,6 @@
-#pragma once
+// Copyright [2021] <tiansongyu>
+#ifndef _6502_6502LIB_SRC_PUBLIC_MAPPER_000_H_
+#define _6502_6502LIB_SRC_PUBLIC_MAPPER_000_H_
 #include "Mapper.h"
 
 class Mapper_000 : public Mapper {
@@ -16,3 +18,4 @@ class Mapper_000 : public Mapper {
 
   // No local equipment required
 };
+#endif  // _6502_6502LIB_SRC_PUBLIC_MAPPER_000_H_
diff --git a/6502/6502Lib/src/public/Mapper_001.cpp b/6502/6502Lib/src/public/Mapper_001.cpp
@@ -1,3 +1,5 @@
+// Copyright [2021] <tiansongyu>
+
 #include "Mapper_001.h"
 
 Mapper_001::Mapper_001(uint8_t prgBanks, uint8_t chrBanks)
@@ -99,24 +101,24 @@ bool Mapper_001::cpuMapWrite(uint16_t addr, uint32_t &mapped_addr,
       // Sets the switchable PRG ROM bank to the value of A.;
       // ;
       // A MMC1_SR MMC1_PB
-      // 	setPRGBank:;
+      //    setPRGBank:;
       // 000edcba 10000 Start with an empty shift register(SR).The 1 is used
-      // 	sta $E000;
+      //    sta $E000;
       // 000edcba->a1000 to detect when the SR has become full.lsr a;
       // > 0000edcb a1000
-      // 		sta $E000;
+      //        sta $E000;
       // 0000edcb->ba100
-      // 	lsr a;
+      //    lsr a;
       // > 00000edc ba100
-      // 		sta $E000;
+      //        sta $E000;
       // 00000edc->cba10
-      // 	lsr a;
+      //    lsr a;
       // > 000000ed cba10
-      // 		sta $E000;
+      //        sta $E000;
       // 000000ed->dcba1 Once a 1 is shifted into the last position, the SR is
-      // full.lsr a; > 0000000e dcba1 		sta $E000; 0000000e dcba1->edcba A write
-      // with the SR full copies D0 and the SR to a bank register; 10000($E000 -
-      // $FFFF means PRG bank number) and then clears the SR.rts
+      // full.lsr a; > 0000000e dcba1       sta $E000; 0000000e dcba1->edcba
+      // A write with the SR full copies D0 and the SR to a bank register;
+      // 10000($E000 - $FFFF means PRG bank number) and then clears the SR.rts
 
       nLoadRegister >>= 1;
       nLoadRegister |= (data & 0x01) << 4;
@@ -126,9 +128,8 @@ bool Mapper_001::cpuMapWrite(uint16_t addr, uint32_t &mapped_addr,
         // Get Mapper Target Register, by examining
         // bits 13 & 14 of the address
         uint8_t nTargetRegister = (addr >> 13) & 0x03;
-
-        if (nTargetRegister == 0)  // 0x8000 - 0x9FFF
-        {
+        // 0x8000 - 0x9FFF
+        if (nTargetRegister == 0) {
           // Set Control Register
           nControlRegister = nLoadRegister & 0x1F;
 
@@ -146,8 +147,7 @@ bool Mapper_001::cpuMapWrite(uint16_t addr, uint32_t &mapped_addr,
               mirrormode = HORIZONTAL;
               break;
           }
-        } else if (nTargetRegister == 1)  // 0xA000 - 0xBFFF
-        {
+        } else if (nTargetRegister == 1) {  // 0xA000 - 0xBFFF
           // Set CHR Bank Lo
           if (nControlRegister & 0b10000) {
             // 4K CHR Bank at PPU 0x0000
@@ -156,15 +156,13 @@ bool Mapper_001::cpuMapWrite(uint16_t addr, uint32_t &mapped_addr,
             // 8K CHR Bank at PPU 0x0000
             nCHRBankSelect8 = nLoadRegister & 0x1E;
           }
-        } else if (nTargetRegister == 2)  // 0xC000 - 0xDFFF
-        {
+        } else if (nTargetRegister == 2) {  // 0xC000 - 0xDFFF
           // Set CHR Bank Hi
           if (nControlRegister & 0b10000) {
             // 4K CHR Bank at PPU 0x1000
             nCHRBankSelect4Hi = nLoadRegister & 0x1F;
           }
-        } else if (nTargetRegister == 3)  // 0xE000 - 0xFFFF
-        {
+        } else if (nTargetRegister == 3) {  // 0xE000 - 0xFFFF
           // Configure PRG Banks
           uint8_t nPRGMode = (nControlRegister >> 2) & 0x03;
 
@@ -250,4 +248,4 @@ void Mapper_001::reset() {
   nPRGBankSelect16Hi = nPRGBanks - 1;
 }
 
-MIRROR Mapper_001::mirror() { return mirrormode; }
+MIRROR Mapper_001::mirror() { return mirrormode; }
diff --git a/6502/6502Lib/src/public/Mapper_001.h b/6502/6502Lib/src/public/Mapper_001.h
@@ -1,4 +1,6 @@
-#pragma once
+// Copyright [2021] <tiansongyu>
+#ifndef _6502_6502LIB_SRC_PUBLIC_MAPPER_001_H_
+#define _6502_6502LIB_SRC_PUBLIC_MAPPER_001_H_
 #include <vector>
 
 #include "Mapper.h"
@@ -37,3 +39,4 @@ class Mapper_001 : public Mapper {
 
   std::vector<uint8_t> vRAMStatic;
 };
+#endif  // _6502_6502LIB_SRC_PUBLIC_MAPPER_001_H_
diff --git a/6502/6502Lib/src/public/Mapper_002.cpp b/6502/6502Lib/src/public/Mapper_002.cpp
@@ -1,3 +1,5 @@
+// Copyright [2021] <tiansongyu>
+
 #include "Mapper_002.h"
 
 Mapper_002::Mapper_002(uint8_t prgBanks, uint8_t chrBanks)
diff --git a/6502/6502Lib/src/public/Mapper_002.h b/6502/6502Lib/src/public/Mapper_002.h
@@ -1,3 +1,5 @@
+// Copyright [2021] <tiansongyu>
+
 #pragma once
 #include "Mapper.h"
 
diff --git a/6502/6502Lib/src/public/Mapper_003.cpp b/6502/6502Lib/src/public/Mapper_003.cpp
@@ -1,3 +1,5 @@
+// Copyright [2021] <tiansongyu>
+
 #include "Mapper_003.h"
 
 Mapper_003::Mapper_003(uint8_t prgBanks, uint8_t chrBanks)
diff --git a/6502/6502Lib/src/public/Mapper_003.h b/6502/6502Lib/src/public/Mapper_003.h
@@ -1,3 +1,5 @@
+// Copyright [2021] <tiansongyu>
+
 #pragma once
 #include "Mapper.h"
 
diff --git a/6502/6502Lib/src/public/Mapper_004.cpp b/6502/6502Lib/src/public/Mapper_004.cpp
@@ -1,3 +1,5 @@
+// Copyright [2021] <tiansongyu>
+
 #include "Mapper_004.h"
 
 #include <stdio.h>
@@ -122,7 +124,7 @@ bool Mapper_004::cpuMapWrite(uint16_t addr, uint32_t &mapped_addr,
         mirrormode = MIRROR::VERTICAL;
     } else {
       // PRG Ram Protect
-      // TODO:
+      // TODO(tiansongyu)
     }
     return false;
   }
@@ -229,8 +231,7 @@ void Mapper_004::scanline() {
     nIrqCounter = nIrqLatch;
   } else
     nIrqCounter--;
-
   if (nIrqCounter == 0 && bIRQEnable) {
     bIRQActive = true;
   }
-}
+}
diff --git a/6502/6502Lib/src/public/Mapper_004.h b/6502/6502Lib/src/public/Mapper_004.h
@@ -1,3 +1,5 @@
+// Copyright [2020-2021] <tiansongyu>
+
 #pragma once
 #include <vector>
 
diff --git a/6502/6502Lib/src/public/Mapper_066.cpp b/6502/6502Lib/src/public/Mapper_066.cpp
@@ -1,3 +1,5 @@
+// Copyright [2020-2021] <tiansongyu>
+
 #include "Mapper_066.h"
 
 Mapper_066::Mapper_066(uint8_t prgBanks, uint8_t chrBanks)
diff --git a/6502/6502Lib/src/public/Mapper_066.h b/6502/6502Lib/src/public/Mapper_066.h
@@ -1,3 +1,5 @@
+// Copyright [2020-2021] <tiansongyu>
+
 #pragma once
 #include "Mapper.h"
 
diff --git a/6502/6502Lib/src/public/olc2A03.cpp b/6502/6502Lib/src/public/olc2A03.cpp
@@ -1,3 +1,5 @@
+// Copyright [2020-2021] <tiansongyu>
+
 #include "olc2A03.h"
 
 uint8_t olc2A03::length_table[] = {
@@ -118,8 +120,7 @@ void olc2A03::cpuWrite(uint16_t addr, uint8_t data) {
 
     case 0x400E:
       // Loop noise ???
-      switch (data & 0x0F)  //  noise period (P)
-      {
+      switch (data & 0x0F) {  //  noise period (P)
         case 0x00:
           noise_seq.reload = 0;
           break;
@@ -184,7 +185,7 @@ void olc2A03::cpuWrite(uint16_t addr, uint8_t data) {
       noise_env.start = true;
       noise_lc.counter =
           length_table[(data & 0xF8) >>
-                       3];  // 长度计数器负载 (L) 	Length counter load
+                       3];  // 长度计数器负载 (L)   Length counter load
       break;
   }
 }
@@ -193,9 +194,9 @@ uint8_t olc2A03::cpuRead(uint16_t addr) {
   uint8_t data = 0x00;
 
   if (addr == 0x4015) {
-    //	data |= (pulse1_lc.counter > 0) ? 0x01 : 0x00;
-    //	data |= (pulse2_lc.counter > 0) ? 0x02 : 0x00;
-    //	data |= (noise_lc.counter > 0) ? 0x04 : 0x00;
+    //  data |= (pulse1_lc.counter > 0) ? 0x01 : 0x00;
+    //  data |= (pulse2_lc.counter > 0) ? 0x02 : 0x00;
+    //  data |= (noise_lc.counter > 0) ? 0x04 : 0x00;
   }
 
   return data;
@@ -254,21 +255,21 @@ void olc2A03::clock() {
       pulse2_sweep.clock(pulse2_seq.reload, 1);
     }
 
-    //	if (bUseRawMode)
+    //  if (bUseRawMode)
     {
       // Update Pulse1 Channel ================================
       pulse1_seq.clock(pulse1_enable, [](uint32_t &s) {
         // Shift right by 1 bit, wrapping around
         s = ((s & 0x0001) << 7) | ((s & 0x00FE) >> 1);
       });
 
-      //	pulse1_sample = (double)pulse1_seq.output;
+      //    pulse1_sample = (double)pulse1_seq.output;
     }
     // else
     {
       pulse1_osc.frequency =
-          1789773.0 / (16.0 * (double)(pulse1_seq.reload + 1));
-      pulse1_osc.amplitude = (double)(pulse1_env.output - 1) / 16.0;
+          1789773.0 / (16.0 * static_cast<double>(pulse1_seq.reload + 1));
+      pulse1_osc.amplitude = static_cast<double>(pulse1_env.output - 1) / 16.0f;
       pulse1_sample = pulse1_osc.sample(dGlobalTime);
 
       if (pulse1_lc.counter > 0 && pulse1_seq.timer >= 8 &&
@@ -286,13 +287,13 @@ void olc2A03::clock() {
         s = ((s & 0x0001) << 7) | ((s & 0x00FE) >> 1);
       });
 
-      //	pulse2_sample = (double)pulse2_seq.output;
+      //    pulse2_sample = (double)pulse2_seq.output;
     }
-    //	else
+    //  else
     {
       pulse2_osc.frequency =
-          1789773.0 / (16.0 * (double)(pulse2_seq.reload + 1));
-      pulse2_osc.amplitude = (double)(pulse2_env.output - 1) / 16.0;
+          1789773.0 / (16.0 * static_cast<double>(pulse2_seq.reload + 1));
+      pulse2_osc.amplitude = static_cast<double>(pulse2_env.output - 1) / 16.0;
       pulse2_sample = pulse2_osc.sample(dGlobalTime);
 
       if (pulse2_lc.counter > 0 && pulse2_seq.timer >= 8 &&
@@ -307,8 +308,8 @@ void olc2A03::clock() {
     });
 
     if (noise_lc.counter > 0 && noise_seq.timer >= 8) {
-      noise_output =
-          (double)noise_seq.output * ((double)(noise_env.output - 1) / 16.0);
+      noise_output = static_cast<double>(noise_seq.output) *
+                     (static_cast<double>(noise_env.output - 1) / 16.0);
     }
 
     if (!pulse1_enable) pulse1_output = 0;
@@ -342,4 +343,4 @@ double olc2A03::GetOutputSample() {
   }
 }
 
-void olc2A03::reset() {}
+void olc2A03::reset() {}
diff --git a/6502/6502Lib/src/public/olc2A03.h b/6502/6502Lib/src/public/olc2A03.h
@@ -179,8 +179,7 @@ class olc2A03 {
     uint16_t decay_count = 0;
   };
 
-  struct oscpulse  // 脉冲
-  {
+  struct oscpulse {  // 脉冲
     double frequency = 0;
     double dutycycle = 0;
     double amplitude = 1;
@@ -194,8 +193,8 @@ class olc2A03 {
 
       auto approxsin = [](float t) {
         float j = t * 0.15915;
-        j = j - (int)j;
-        return 20.785 * j * (j - 0.5) * (j - 1.0f);
+        j = j - static_cast<int>(j);
+        return 20.785f * j * (j - 0.5) * (j - 1.0f);
       };
 
       for (double n = 1; n < harmonics; n++) {
@@ -221,7 +220,7 @@ class olc2A03 {
     uint16_t change = 0;
     bool mute = false;
 
-    void track(uint16_t &target) {
+    void track(uint16_t target) {
       if (enabled) {
         change = target >> shift;
         mute = (target < 8) || (target > 0x7FF);
diff --git a/6502/6502Lib/src/public/olc2C02.cpp b/6502/6502Lib/src/public/olc2C02.cpp
diff --git a/6502/6502Lib/src/public/olc2C02.h b/6502/6502Lib/src/public/olc2C02.h
diff --git a/6502/6502Lib/src/public/olc6502.cpp b/6502/6502Lib/src/public/olc6502.cpp
diff --git a/6502/6502Lib/src/public/olc6502.h b/6502/6502Lib/src/public/olc6502.h
diff --git a/6502/6502Lib/src/public/olcPGEX_Sound.h b/6502/6502Lib/src/public/olcPGEX_Sound.h
diff --git a/6502/6502Lib/src/public/olcPixelGameEngine.h b/6502/6502Lib/src/public/olcPixelGameEngine.h

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright [2021] <tiansongyu>`
	`1`	`+// Copyright [2020-2021] <tiansongyu>`
`2`	`2`	`#include "Bus.h"`
`3`	`3`
`4`	`4`	`Bus::Bus() {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Copyright [2020-2021] <tiansongyu>`
	`2`	`+`
`1`	`3`	`#include "Mapper.h"`
`2`	`4`
`3`	`5`	`Mapper::Mapper(uint8_t prgBanks, uint8_t chrBanks) {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Copyright [2020-2021] <tiansongyu>`
	`2`	`+`
`1`	`3`	`#pragma once`
`2`	`4`	`#include <cstdint>`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Copyright [2021] <tiansongyu>`
	`2`	`+`
`1`	`3`	`#include "Mapper_000.h"`
`2`	`4`
`3`	`5`	`Mapper_000::Mapper_000(uint8_t prgBanks, uint8_t chrBanks)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Copyright [2021] <tiansongyu>`
	`2`	`+`
`1`	`3`	`#include "Mapper_002.h"`
`2`	`4`
`3`	`5`	`Mapper_002::Mapper_002(uint8_t prgBanks, uint8_t chrBanks)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Copyright [2021] <tiansongyu>`
	`2`	`+`
`1`	`3`	`#include "Mapper_003.h"`
`2`	`4`
`3`	`5`	`Mapper_003::Mapper_003(uint8_t prgBanks, uint8_t chrBanks)`