Skip to content

Commit

Permalink
Added underscore prefix to names of #include'd *.cpp files
Browse files Browse the repository at this point in the history
  • Loading branch information
Marat-Tanalin committed Aug 13, 2020
1 parent c867dd4 commit 168d3a4
Show file tree
Hide file tree
Showing 430 changed files with 473 additions and 443 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Emulator {

#include "stream.cpp"
#include "_stream.cpp"
Audio audio;

Audio::~Audio() {
Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion bsnes/emulator/emulator.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <emulator/emulator.hpp>
#include <emulator/audio/audio.cpp>

#include <emulator/audio/_audio.cpp>

namespace Emulator {

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
34 changes: 17 additions & 17 deletions bsnes/filter/filter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

#undef register
#define register
#include "sai/sai.cpp"
#include "sai/_sai.cpp"

uint32_t* colortable;
#include "snes_ntsc/snes_ntsc.h"
#include "snes_ntsc/snes_ntsc.c"
#include "snes_ntsc/_snes_ntsc.c"

#include "none.cpp"
#include "scanlines-light.cpp"
#include "scanlines-dark.cpp"
#include "scanlines-black.cpp"
#include "pixellate2x.cpp"
#include "scale2x.cpp"
#include "2xsai.cpp"
#include "super-2xsai.cpp"
#include "super-eagle.cpp"
#include "lq2x.cpp"
#include "hq2x.cpp"
#include "ntsc-rf.cpp"
#include "ntsc-composite.cpp"
#include "ntsc-svideo.cpp"
#include "ntsc-rgb.cpp"
#include "_none.cpp"
#include "_scanlines-light.cpp"
#include "_scanlines-dark.cpp"
#include "_scanlines-black.cpp"
#include "_pixellate2x.cpp"
#include "_scale2x.cpp"
#include "_2xsai.cpp"
#include "_super-2xsai.cpp"
#include "_super-eagle.cpp"
#include "_lq2x.cpp"
#include "_hq2x.cpp"
#include "_ntsc-rf.cpp"
#include "_ntsc-composite.cpp"
#include "_ntsc-svideo.cpp"
#include "_ntsc-rgb.cpp"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 8 additions & 8 deletions bsnes/processor/arm7tdmi/arm7tdmi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

namespace Processor {

#include "registers.cpp"
#include "memory.cpp"
#include "algorithms.cpp"
#include "instruction.cpp"
#include "instructions-arm.cpp"
#include "instructions-thumb.cpp"
#include "serialization.cpp"
#include "disassembler.cpp"
#include "_registers.cpp"
#include "_memory.cpp"
#include "_algorithms.cpp"
#include "_instruction.cpp"
#include "_instructions-arm.cpp"
#include "_instructions-thumb.cpp"
#include "_serialization.cpp"
#include "_disassembler.cpp"

ARM7TDMI::ARM7TDMI() {
armInitialize();
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions bsnes/processor/gsu/gsu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

namespace Processor {

#include "instruction.cpp"
#include "instructions.cpp"
#include "serialization.cpp"
#include "disassembler.cpp"
#include "_instruction.cpp"
#include "_instructions.cpp"
#include "_serialization.cpp"
#include "_disassembler.cpp"

auto GSU::power() -> void {
for(auto& r : regs.r) {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions bsnes/processor/hg51b/hg51b.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

namespace Processor {

#include "registers.cpp"
#include "instruction.cpp"
#include "instructions.cpp"
#include "serialization.cpp"
#include "_registers.cpp"
#include "_instruction.cpp"
#include "_instructions.cpp"
#include "_serialization.cpp"

auto HG51B::lock() -> void {
io.lock = 1;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions bsnes/processor/sm83/sm83.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

namespace Processor {

#include "registers.cpp"
#include "memory.cpp"
#include "algorithms.cpp"
#include "instruction.cpp"
#include "instructions.cpp"
#include "serialization.cpp"
#include "disassembler.cpp"
#include "_registers.cpp"
#include "_memory.cpp"
#include "_algorithms.cpp"
#include "_instruction.cpp"
#include "_instructions.cpp"
#include "_serialization.cpp"
#include "_disassembler.cpp"

auto SM83::power() -> void {
r = {};
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 6 additions & 6 deletions bsnes/processor/spc700/spc700.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ namespace Processor {

#define alu (this->*op)

#include "memory.cpp"
#include "algorithms.cpp"
#include "instructions.cpp"
#include "instruction.cpp"
#include "serialization.cpp"
#include "disassembler.cpp"
#include "_memory.cpp"
#include "_algorithms.cpp"
#include "_instructions.cpp"
#include "_instruction.cpp"
#include "_serialization.cpp"
#include "_disassembler.cpp"

auto SPC700::power() -> void {
PC = 0x0000;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions bsnes/processor/upd96050/upd96050.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

namespace Processor {

#include "instructions.cpp"
#include "memory.cpp"
#include "disassembler.cpp"
#include "serialization.cpp"
#include "_instructions.cpp"
#include "_memory.cpp"
#include "_disassembler.cpp"
#include "_serialization.cpp"

auto uPD96050::power() -> void {
if(revision == Revision::uPD7725) {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
21 changes: 11 additions & 10 deletions bsnes/processor/wdc65816/wdc65816.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
namespace Processor {

#include "registers.hpp"
#include "memory.cpp"
#include "algorithms.cpp"

#include "instructions-read.cpp"
#include "instructions-write.cpp"
#include "instructions-modify.cpp"
#include "instructions-pc.cpp"
#include "instructions-other.cpp"
#include "instruction.cpp"
#include "_memory.cpp"
#include "_algorithms.cpp"
#include "_instructions-read.cpp"
#include "_instructions-write.cpp"
#include "_instructions-modify.cpp"
#include "_instructions-pc.cpp"
#include "_instructions-other.cpp"
#include "_instruction.cpp"

auto WDC65816::power() -> void {
r.pc.d = 0x000000;
Expand All @@ -35,7 +35,8 @@ auto WDC65816::power() -> void {
}

#include "registers.hpp"
#include "serialization.cpp"
#include "disassembler.cpp"

#include "_serialization.cpp"
#include "_disassembler.cpp"

}
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 4 additions & 3 deletions bsnes/sfc/cartridge/cartridge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ namespace bms = bsnesMt::strings;

namespace SuperFamicom {

#include "load.cpp"
#include "save.cpp"
#include "serialization.cpp"
#include "_load.cpp"
#include "_save.cpp"
#include "_serialization.cpp"

Cartridge cartridge;

auto Cartridge::hashes() const -> vector<string> {
Expand Down
10 changes: 5 additions & 5 deletions bsnes/sfc/controller/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ namespace SuperFamicom {

ControllerPort controllerPort1;
ControllerPort controllerPort2;
#include "gamepad/gamepad.cpp"
#include "mouse/mouse.cpp"
#include "super-multitap/super-multitap.cpp"
#include "super-scope/super-scope.cpp"
#include "justifier/justifier.cpp"
#include "gamepad/_gamepad.cpp"
#include "mouse/_mouse.cpp"
#include "super-multitap/_super-multitap.cpp"
#include "super-scope/_super-scope.cpp"
#include "justifier/_justifier.cpp"

Controller::Controller(uint port) : port(port) {
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
40 changes: 20 additions & 20 deletions bsnes/sfc/coprocessor/coprocessor.cpp
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
#include <sfc/coprocessor/icd/icd.cpp>
#include <sfc/coprocessor/mcc/mcc.cpp>
#include <sfc/coprocessor/dip/dip.cpp>
#include <sfc/coprocessor/event/event.cpp>
#include <sfc/coprocessor/icd/_icd.cpp>
#include <sfc/coprocessor/mcc/_mcc.cpp>
#include <sfc/coprocessor/dip/_dip.cpp>
#include <sfc/coprocessor/event/_event.cpp>

#include <sfc/coprocessor/sa1/sa1.cpp>
#include <sfc/coprocessor/superfx/superfx.cpp>
#include <sfc/coprocessor/sa1/_sa1.cpp>
#include <sfc/coprocessor/superfx/_superfx.cpp>

#include <sfc/coprocessor/armdsp/armdsp.cpp>
#include <sfc/coprocessor/hitachidsp/hitachidsp.cpp>
#include <sfc/coprocessor/necdsp/necdsp.cpp>
#include <sfc/coprocessor/armdsp/_armdsp.cpp>
#include <sfc/coprocessor/hitachidsp/_hitachidsp.cpp>
#include <sfc/coprocessor/necdsp/_necdsp.cpp>

#include <sfc/coprocessor/epsonrtc/epsonrtc.cpp>
#include <sfc/coprocessor/sharprtc/sharprtc.cpp>
#include <sfc/coprocessor/epsonrtc/_epsonrtc.cpp>
#include <sfc/coprocessor/sharprtc/_sharprtc.cpp>

#include <sfc/coprocessor/spc7110/spc7110.cpp>
#include <sfc/coprocessor/sdd1/sdd1.cpp>
#include <sfc/coprocessor/obc1/obc1.cpp>
#include <sfc/coprocessor/spc7110/_spc7110.cpp>
#include <sfc/coprocessor/sdd1/_sdd1.cpp>
#include <sfc/coprocessor/obc1/_obc1.cpp>

#include <sfc/coprocessor/msu1/msu1.cpp>
#include <sfc/coprocessor/msu1/_msu1.cpp>

#include <sfc/coprocessor/cx4/cx4.cpp>
#include <sfc/coprocessor/dsp1/dsp1.cpp>
#include <sfc/coprocessor/dsp2/dsp2.cpp>
#include <sfc/coprocessor/dsp4/dsp4.cpp>
#include <sfc/coprocessor/st0010/st0010.cpp>
#include <sfc/coprocessor/cx4/_cx4.cpp>
#include <sfc/coprocessor/dsp1/_dsp1.cpp>
#include <sfc/coprocessor/dsp2/_dsp2.cpp>
#include <sfc/coprocessor/dsp4/_dsp4.cpp>
#include <sfc/coprocessor/st0010/_st0010.cpp>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion bsnes/sfc/coprocessor/spc7110/dcu.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "decompressor.cpp"
#include "_decompressor.cpp"

auto SPC7110::dcuLoadAddress() -> void {
uint table = r4801 | r4802 << 8 | r4803 << 16;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
13 changes: 7 additions & 6 deletions bsnes/sfc/cpu/cpu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
namespace SuperFamicom {

CPU cpu;
#include "dma.cpp"
#include "memory.cpp"
#include "io.cpp"
#include "timing.cpp"
#include "irq.cpp"
#include "serialization.cpp"

#include "_dma.cpp"
#include "_memory.cpp"
#include "_io.cpp"
#include "_timing.cpp"
#include "_irq.cpp"
#include "_serialization.cpp"

auto CPU::synchronizeSMP() -> void {
if(smp.clock < 0) scheduler.resume(smp.thread);
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions bsnes/sfc/dsp/dsp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ namespace SuperFamicom {

DSP dsp;

#include "serialization.cpp"
#include "SPC_DSP.cpp"
#include "_serialization.cpp"
#include "_SPC_DSP.cpp"

auto DSP::main() -> void {
if(!configuration.hacks.dsp.fast) {
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions bsnes/sfc/expansion/expansion.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <sfc/sfc.hpp>
#include <sfc/expansion/satellaview/satellaview.cpp>
//#include <sfc/expansion/21fx/21fx.cpp>
#include <sfc/expansion/satellaview/_satellaview.cpp>
//#include <sfc/expansion/21fx/_21fx.cpp>

namespace SuperFamicom {

Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion bsnes/sfc/interface/interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
namespace SuperFamicom {

Settings settings;
#include "configuration.cpp"

#include "_configuration.cpp"

auto Interface::information() -> Information {
Information information;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 9 additions & 8 deletions bsnes/sfc/ppu-fast/ppu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ PPU& ppubase = ppu;
#define ppu ppufast

PPU ppu;
#include "io.cpp"
#include "line.cpp"
#include "background.cpp"
#include "mode7.cpp"
#include "mode7hd.cpp"
#include "object.cpp"
#include "window.cpp"
#include "serialization.cpp"

#include "_io.cpp"
#include "_line.cpp"
#include "_background.cpp"
#include "_mode7.cpp"
#include "_mode7hd.cpp"
#include "_object.cpp"
#include "_window.cpp"
#include "_serialization.cpp"

auto PPU::interlace() const -> bool { return ppubase.display.interlace; }
auto PPU::overscan() const -> bool { return ppubase.display.overscan; }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "mode7.cpp"
#include "_mode7.cpp"

auto PPU::Background::hires() const -> bool {
return ppu.io.bgMode == 5 || ppu.io.bgMode == 6;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion bsnes/sfc/ppu/object.cpp → bsnes/sfc/ppu/_object.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "oam.cpp"
#include "_oam.cpp"

auto PPU::Object::addressReset() -> void {
ppu.io.oamAddress = ppu.io.oamBaseAddress;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
19 changes: 10 additions & 9 deletions bsnes/sfc/ppu/ppu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
namespace SuperFamicom {

PPU ppu;
#include "main.cpp"
#include "io.cpp"
#include "mosaic.cpp"
#include "background.cpp"
#include "object.cpp"
#include "window.cpp"
#include "screen.cpp"
#include "serialization.cpp"
#include "counter/serialization.cpp"

#include "_main.cpp"
#include "_io.cpp"
#include "_mosaic.cpp"
#include "_background.cpp"
#include "_object.cpp"
#include "_window.cpp"
#include "_screen.cpp"
#include "_serialization.cpp"
#include "counter/_serialization.cpp"

PPU::PPU() :
bg1(Background::ID::BG1),
Expand Down
File renamed without changes.
Loading

0 comments on commit 168d3a4

Please sign in to comment.