forked from libretro/bsnes-mercury
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathchanges.diff
1078 lines (992 loc) · 35.9 KB
/
changes.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
Only in bsneshle094/ananke/obj: .gitignore
Only in bsneshle094: bsnes_accuracy_libretro.so
Only in bsneshle094: bsnes_balanced_libretro.so
Only in bsneshle094: changes.diff
Only in bsneshle094: changes-libretro.diff
Only in bsneshle094: diff.sh
diff -ru higan_v094-source/emulator/emulator.hpp bsneshle094/emulator/emulator.hpp
--- higan_v094-source/emulator/emulator.hpp 2014-01-20 07:36:22.000000000 +0100
+++ bsneshle094/emulator/emulator.hpp 2014-04-26 16:20:16.498065832 +0200
@@ -143,7 +143,7 @@
typedef uint30_t uint30;
typedef uint31_t uint31;
typedef uint32_t uint32;
-typedef uint_t<33> uint33;
+typedef nall::uint_t<33> uint33;
typedef uint64_t uint64;
typedef varuint_t<unsigned> varuint;
diff -ru higan_v094-source/emulator/interface.hpp bsneshle094/emulator/interface.hpp
--- higan_v094-source/emulator/interface.hpp 2013-12-23 08:39:57.000000000 +0100
+++ bsneshle094/emulator/interface.hpp 2014-08-19 14:54:43.757727345 +0200
@@ -59,6 +59,7 @@
virtual string path(unsigned) { return ""; }
virtual string server() { return ""; }
virtual void notify(string text) { print(text, "\n"); }
+ virtual unsigned altImplementation(unsigned) { return 0; }
};
Bind* bind = nullptr;
Only in bsneshle094: .git
Only in bsneshle094: install.sh
Only in higan_v094-source: libco
Only in bsneshle094: libretro-sdk
Only in bsneshle094: LICENSE
diff -ru higan_v094-source/Makefile bsneshle094/Makefile
--- higan_v094-source/Makefile 2013-10-20 14:39:14.000000000 +0200
+++ bsneshle094/Makefile 2014-11-14 23:01:02.553698866 +0100
@@ -1,20 +1,40 @@
include nall/Makefile
+ifeq ($(platform),win)
+ override platform = windows
+else ifeq ($(platform),mingw)
+ override platform = windows
+else ifeq ($(platform),osx)
+ override platform = macosx
+else ifeq ($(platform),unix)
+ override platform = linux
+else ifeq ($(platform),x)
+ override platform = linux
+endif
+
fc := fc
sfc := sfc
gb := gb
gba := gba
profile := accuracy
-target := ethos
+target := libretro
# options += debugger
# arch := x86
# console := true
# compiler
-flags += -I. -O3 -fomit-frame-pointer
-link +=
+
+ifneq ($(debug),)
+ flags := -I. -O0 -g
+else
+ flags := -I. -O3 -fomit-frame-pointer
+endif
+
+cflags := -std=gnu99 -xc
+cppflags := -std=gnu++0x
+
objects := libco
# profile-guided optimization mode
@@ -28,33 +48,43 @@
flags += -fprofile-use
endif
-# platform
-ifeq ($(platform),windows)
- ifeq ($(arch),x86)
- flags += -m32
- link += -m32
- endif
- ifeq ($(console),true)
- link += -mconsole
+ifeq ($(compiler),)
+ ifneq ($(CXX),)
+ compiler := $(CXX)
else
- link += -mwindows
+ compiler := g++
endif
- link += -s -mthreads -luuid -lkernel32 -luser32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 -lole32 -lws2_32
- link += -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
-else ifeq ($(platform),macosx)
- flags += -march=native
-else ifeq ($(platform),linux)
- flags += -march=native
- link += -s -Wl,-export-dynamic -lX11 -lXext -ldl
-else ifeq ($(platform),bsd)
- flags += -march=native
- link += -s -Wl,-export-dynamic -lX11 -lXext
-else
- $(error unsupported platform.)
endif
+# platform
ui := target-$(target)
+ifeq ($(findstring libretro,$(ui)),)
+ ifeq ($(platform),windows)
+ ifeq ($(arch),x86)
+ flags += -m32
+ link += -m32
+ endif
+ ifeq ($(console),true)
+ link += -mconsole
+ else
+ link += -mwindows
+ endif
+ link += -s -mthreads -luuid -lkernel32 -luser32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 -lole32 -lws2_32
+ link += -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
+ else ifeq ($(platform),macosx)
+ flags += -march=native
+ else ifeq ($(platform),linux)
+ flags += -march=native
+ link += -s -Wl,-export-dynamic -lX11 -lXext -ldl
+ else ifeq ($(platform),bsd)
+ flags += -march=native
+ link += -s -Wl,-export-dynamic -lX11 -lXext
+ else
+ $(error unsupported platform.)
+ endif
+endif
+
# implicit rules
compile = \
$(strip \
Only in bsneshle094: make.sh
diff -ru higan_v094-source/nall/file.hpp bsneshle094/nall/file.hpp
--- higan_v094-source/nall/file.hpp 2014-01-20 07:37:12.000000000 +0100
+++ bsneshle094/nall/file.hpp 2014-04-26 17:34:50.338149822 +0200
@@ -9,6 +9,10 @@
#include <nall/windows/utf8.hpp>
#include <nall/stream/memory.hpp>
+#ifdef __APPLE__
+#include "TargetConditionals.h"
+#endif
+
namespace nall {
inline FILE* fopen_utf8(const string& filename, const string& mode) {
@@ -232,7 +236,10 @@
}
static bool exists(const string& filename) {
- #if !defined(_WIN32)
+ #if defined(__APPLE__) && TARGET_OS_IPHONE
+ struct stat data;
+ if(stat(filename, &data) != 0) return false;
+ #elif !defined(_WIN32)
struct stat data;
if(stat(filename, &data) != 0) return false;
#else
@@ -244,7 +251,10 @@
}
static uintmax_t size(const string& filename) {
- #if !defined(_WIN32)
+ #if defined(__APPLE__) && TARGET_OS_IPHONE
+ struct stat data;
+ if(stat(filename, &data) != 0) return false;
+ #elif !defined(_WIN32)
struct stat data;
stat(filename, &data);
#else
@@ -255,7 +265,10 @@
}
static time_t timestamp(const string& filename, file::time mode = file::time::create) {
- #if !defined(_WIN32)
+ #if defined(__APPLE__) && TARGET_OS_IPHONE
+ struct stat data;
+ if(stat(filename, &data) != 0) return false;
+ #elif !defined(_WIN32)
struct stat data;
stat(filename, &data);
#else
diff -ru higan_v094-source/nall/intrinsics.hpp bsneshle094/nall/intrinsics.hpp
--- higan_v094-source/nall/intrinsics.hpp 2014-01-20 07:37:12.000000000 +0100
+++ bsneshle094/nall/intrinsics.hpp 2014-05-27 22:37:16.697326984 +0200
@@ -6,7 +6,7 @@
struct Intrinsics {
enum class Compiler : unsigned { Clang, GCC, VisualCPP, Unknown };
enum class Platform : unsigned { Windows, MacOSX, X, Unknown }; //X = Linux, BSD, etc
- enum class Architecture : unsigned { x86, amd64, Unknown };
+ enum class Architecture : unsigned { x86, amd64, ARM, Unknown };
enum class Endian : unsigned { LSB, MSB, Unknown };
static inline Compiler compiler();
@@ -57,6 +57,9 @@
#elif defined(__amd64__) || defined(_M_AMD64)
#define ARCH_AMD64
Intrinsics::Architecture Intrinsics::architecture() { return Intrinsics::Architecture::amd64; }
+#elif defined(__arm__) || defined(__ARM_EABI__)
+ #define ARCH_ARM
+ Intrinsics::Architecture Intrinsics::architecture() { return Intrinsics::Architecture::ARM; }
#else
#warning "unable to detect architecture"
#define ARCH_UNKNOWN
@@ -65,7 +68,7 @@
/* Endian detection */
-#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN__) || defined(__i386__) || defined(__amd64__) || defined(_M_IX86) || defined(_M_AMD64)
+#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN__) || defined(__i386__) || defined(__amd64__) || defined(_M_IX86) || defined(_M_AMD64) || defined(__ARM_EABI__) || defined(__arm__)
#define ENDIAN_LSB
Intrinsics::Endian Intrinsics::endian() { return Intrinsics::Endian::LSB; }
#elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN) || defined(__BIG_ENDIAN__) || defined(__powerpc__) || defined(_M_PPC)
diff -ru higan_v094-source/nall/Makefile bsneshle094/nall/Makefile
--- higan_v094-source/nall/Makefile 2014-01-20 07:37:12.000000000 +0100
+++ bsneshle094/nall/Makefile 2014-08-20 17:41:55.249337200 +0200
@@ -22,6 +22,9 @@
else ifneq ($(findstring CYGWIN,$(uname)),)
platform := windows
delete = del $(subst /,\,$1)
+ else ifneq ($(findstring MINGW,$(uname)),)
+ platform := windows
+ delete = del $(subst /,\,$1)
else ifneq ($(findstring Darwin,$(uname)),)
platform := macosx
delete = rm -f $1
diff -ru higan_v094-source/nall/platform.hpp bsneshle094/nall/platform.hpp
--- higan_v094-source/nall/platform.hpp 2014-01-20 07:37:12.000000000 +0100
+++ bsneshle094/nall/platform.hpp 2014-11-14 23:01:04.933698821 +0100
@@ -41,7 +41,11 @@
#undef interface
#define dllexport __declspec(dllexport)
#else
+#ifdef __APPLE__
+ #include <machine/endian.h>
+#else
#include <endian.h>
+#endif
#include <unistd.h>
#include <pwd.h>
#define dllexport
Only in bsneshle094/obj: .gitignore
Only in bsneshle094/out: bsnes_mercury_libretro_old.so
Only in bsneshle094/out: .gitignore
Only in bsneshle094/out: libsupergameboy.so
Only in bsneshle094: README
diff -ru higan_v094-source/sfc/alt/cpu/cpu.cpp bsneshle094/sfc/alt/cpu/cpu.cpp
--- higan_v094-source/sfc/alt/cpu/cpu.cpp 2013-05-05 08:00:10.000000000 +0200
+++ bsneshle094/sfc/alt/cpu/cpu.cpp 2014-05-03 20:02:34.275109688 +0200
@@ -99,9 +99,9 @@
reader = [](unsigned addr) { return cpu.wram[addr]; };
writer = [](unsigned addr, uint8 data) { cpu.wram[addr] = data; };
- bus.map(reader, writer, 0x00, 0x3f, 0x0000, 0x1fff, 0x002000);
- bus.map(reader, writer, 0x80, 0xbf, 0x0000, 0x1fff, 0x002000);
- bus.map(reader, writer, 0x7e, 0x7f, 0x0000, 0xffff, 0x020000);
+ bus.map(reader, writer, 0x00, 0x3f, 0x0000, 0x1fff, 0x002000, 0,0, Cartridge::Mapping::fastmode_readwrite, cpu.wram);
+ bus.map(reader, writer, 0x80, 0xbf, 0x0000, 0x1fff, 0x002000, 0,0, Cartridge::Mapping::fastmode_readwrite, cpu.wram);
+ bus.map(reader, writer, 0x7e, 0x7f, 0x0000, 0xffff, 0x020000, 0,0, Cartridge::Mapping::fastmode_readwrite, cpu.wram);
}
void CPU::power() {
diff -ru higan_v094-source/sfc/cartridge/cartridge.cpp bsneshle094/sfc/cartridge/cartridge.cpp
--- higan_v094-source/sfc/cartridge/cartridge.cpp 2013-05-05 08:31:39.000000000 +0200
+++ bsneshle094/sfc/cartridge/cartridge.cpp 2014-08-19 15:44:56.053783897 +0200
@@ -49,6 +49,14 @@
has_hsu1 = false;
has_msu1 = false;
+ has_dsp1 = false;
+ has_dsp2 = false;
+ has_dsp3 = false;
+ has_dsp4 = false;
+ has_cx4 = false;
+ has_st0010 = false;
+ has_sgbexternal = false;
+
information.markup.cartridge = "";
information.markup.gameBoy = "";
information.markup.satellaview = "";
diff -ru higan_v094-source/sfc/cartridge/cartridge.hpp bsneshle094/sfc/cartridge/cartridge.hpp
--- higan_v094-source/sfc/cartridge/cartridge.hpp 2013-01-22 23:52:43.000000000 +0100
+++ bsneshle094/sfc/cartridge/cartridge.hpp 2014-08-19 15:45:47.797784868 +0200
@@ -39,6 +39,13 @@
readonly<bool> has_obc1;
readonly<bool> has_hsu1;
readonly<bool> has_msu1;
+ readonly<bool> has_dsp1;
+ readonly<bool> has_dsp2;
+ readonly<bool> has_dsp3;
+ readonly<bool> has_dsp4;
+ readonly<bool> has_cx4;
+ readonly<bool> has_st0010;
+ readonly<bool> has_sgbexternal;
struct Mapping {
function<uint8 (unsigned)> reader;
@@ -48,6 +55,9 @@
unsigned base;
unsigned mask;
+ enum fastmode_t { fastmode_slow, fastmode_readonly, fastmode_readwrite } fastmode;
+ uint8* fastptr;
+
Mapping();
Mapping(const function<uint8 (unsigned)>&, const function<void (unsigned, uint8)>&);
Mapping(SuperFamicom::Memory&);
@@ -116,6 +126,10 @@
void parse_markup_obc1(Markup::Node);
void parse_markup_hsu1(Markup::Node);
void parse_markup_msu1(Markup::Node);
+
+ void parse_markup_hitachidsp_hle(Markup::Node);
+ void parse_markup_necdsp_hle(Markup::Node);
+ bool parse_markup_icd2_external(Markup::Node);
friend class Interface;
};
diff -ru higan_v094-source/sfc/cartridge/markup.cpp bsneshle094/sfc/cartridge/markup.cpp
--- higan_v094-source/sfc/cartridge/markup.cpp 2013-12-06 21:58:46.000000000 +0100
+++ bsneshle094/sfc/cartridge/markup.cpp 2014-08-19 16:45:00.909851573 +0200
@@ -64,6 +64,8 @@
Mapping m(rom);
parse_markup_map(m, node);
if(m.size == 0) m.size = rom.size();
+ m.fastmode = Mapping::fastmode_readonly;
+ m.fastptr = rom.data();
mapping.append(m);
}
@@ -71,6 +73,8 @@
Mapping m(ram);
parse_markup_map(m, node);
if(m.size == 0) m.size = ram.size();
+ m.fastmode = Mapping::fastmode_readwrite;
+ m.fastptr = ram.data();
mapping.append(m);
}
}
@@ -78,6 +82,10 @@
void Cartridge::parse_markup_icd2(Markup::Node root) {
if(root.exists() == false) return;
+ if(interface->bind->altImplementation(Alt::ForSuperGameBoy)==Alt::SuperGameBoy::External)
+ {
+ if (parse_markup_icd2_external(root)) return;
+ }
has_gb_slot = true;
icd2.revision = max(1, numeral(root["revision"].data));
@@ -340,6 +348,12 @@
void Cartridge::parse_markup_hitachidsp(Markup::Node root, unsigned roms) {
if(root.exists() == false) return;
+ if(interface->bind->altImplementation(Alt::ForDSP) == Alt::DSP::HLE)
+ {
+ //this is after checking existence because we don't want to ask which DSP to use and then use none of them
+ parse_markup_hitachidsp_hle(root);
+ return;
+ }
has_hitachidsp = true;
parse_markup_memory(hitachidsp.rom, root["rom[0]"], ID::HitachiDSPROM, false);
@@ -387,6 +401,11 @@
void Cartridge::parse_markup_necdsp(Markup::Node root) {
if(root.exists() == false) return;
+ if(interface->bind->altImplementation(Alt::ForDSP)==Alt::DSP::HLE)
+ {
+ parse_markup_necdsp_hle(root);
+ return;
+ }
has_necdsp = true;
for(auto& word : necdsp.programROM) word = 0x000000;
@@ -586,20 +605,112 @@
}
}
+void Cartridge::parse_markup_hitachidsp_hle(Markup::Node root) {
+ //root.exists() is known true in the HLE chip handlers
+ parse_markup_cartridge(root);
+
+ has_cx4 = true;
+ for(auto& node : root) {
+ if(node.name != "map" || node["id"].data != "io") continue;
+ Mapping m({&Cx4::read, &cx4}, {&Cx4::write, &cx4});
+ parse_markup_map(m, node);
+ mapping.append(m);
+ }
+}
+
+void Cartridge::parse_markup_necdsp_hle(Markup::Node root) {
+ if (root["model"].data == "uPD7725") {
+ Mapping m;
+ unsigned int select=0;
+ unsigned int * selectaddr=NULL;
+ for(auto& node : root) {
+ if (node.name == "rom" && node["id"].data == "program") {
+ if (node["name"].data == "dsp1.program.rom" || node["name"].data == "dsp1b.program.rom") {
+ has_dsp1 = true;
+ m.reader = {&DSP1::read, &dsp1};
+ m.writer = {&DSP1::write, &dsp1};
+ selectaddr = &dsp1.Select;
+ }
+ if (node["name"].data == "dsp2.program.rom") {
+ has_dsp2 = true;
+ m.reader = {&DSP2::read, &dsp2};
+ m.writer = {&DSP2::write, &dsp2};
+ selectaddr = &dsp2.Select;
+ }
+ if (node["name"].data == "dsp3.program.rom") {
+ has_dsp3 = true;
+ m.reader = {&DSP3::read, &dsp3};
+ m.writer = {&DSP3::write, &dsp3};
+ //some of the chips hardcode the Select value
+ }
+ if (node["name"].data == "dsp4.program.rom") {
+ has_dsp4 = true;
+ m.reader = {&DSP4::read, &dsp4};
+ m.writer = {&DSP4::write, &dsp4};
+ }
+ }
+ if (node.name == "map" && node["id"].data == "io") {
+ parse_markup_map(m, node);
+ select = numeral(node["select"].data);
+ }
+ }
+ if (selectaddr) *selectaddr=select;
+ mapping.append(m);
+ } else {
+ Mapping m({&ST0010::read, &st0010}, {&ST0010::write, &st0010});
+ for(auto& node : root) {
+ if(node.name != "map") continue;
+
+ parse_markup_map(m, node);
+ mapping.append(m);
+ }
+ }
+}
+
+bool Cartridge::parse_markup_icd2_external(Markup::Node root) {
+ //root.exists() is known true here
+ if (!sgbExternal.load_library("/home/alcaro/Desktop/minir/cores/bsnes_v073/supergameboy/libsupergameboy.so"))
+ {
+ interface->bind->notify("Couldn't load external GB emulator, falling back to internal");
+ return false;
+ }
+
+ has_sgbexternal = true;
+ sgbExternal.revision = max(1, numeral(root["revision"].data));
+
+ GameBoy::cartridge.load_empty(GameBoy::System::Revision::SuperGameBoy);
+ interface->loadRequest(ID::SuperGameBoy, "Game Boy", "gb");
+
+ for(auto& node : root) {
+ if(node.name != "map") continue;
+
+ if(node["id"].data == "io") {
+ Mapping m({&SGBExternal::read, &sgbExternal}, {&SGBExternal::write, &sgbExternal});
+ parse_markup_map(m, node);
+ mapping.append(m);
+ }
+ }
+
+ return true;
+}
+
Cartridge::Mapping::Mapping() {
size = base = mask = 0;
+ fastmode = Mapping::fastmode_slow;
}
Cartridge::Mapping::Mapping(SuperFamicom::Memory& memory) {
reader = {&SuperFamicom::Memory::read, &memory};
writer = {&SuperFamicom::Memory::write, &memory};
size = base = mask = 0;
+ fastmode = Mapping::fastmode_slow;
}
Cartridge::Mapping::Mapping(const function<uint8 (unsigned)>& reader, const function<void (unsigned, uint8)>& writer) {
this->reader = reader;
this->writer = writer;
size = base = mask = 0;
+ fastmode = Mapping::fastmode_slow;
}
#endif
diff -ru higan_v094-source/sfc/chip/chip.hpp bsneshle094/sfc/chip/chip.hpp
--- higan_v094-source/sfc/chip/chip.hpp 2013-01-21 07:09:43.000000000 +0100
+++ bsneshle094/sfc/chip/chip.hpp 2014-08-19 15:29:02.525765996 +0200
@@ -25,6 +25,16 @@
#include <sfc/chip/hsu1/hsu1.hpp>
#include <sfc/chip/msu1/msu1.hpp>
+#include <sfc/chip/dsp1/dsp1.hpp>
+#include <sfc/chip/dsp2/dsp2.hpp>
+#include <sfc/chip/dsp3/dsp3.hpp>
+#include <sfc/chip/dsp4/dsp4.hpp>
+
+#include <sfc/chip/cx4/cx4.hpp>
+#include <sfc/chip/st0010/st0010.hpp>
+
+#include <sfc/chip/sgb-external/sgb-external.hpp>
+
void Coprocessor::step(unsigned clocks) {
clock += clocks * (uint64)cpu.frequency;
}
Only in bsneshle094/sfc/chip: cx4
Only in bsneshle094/sfc/chip: dsp1
Only in bsneshle094/sfc/chip: dsp2
Only in bsneshle094/sfc/chip: dsp3
Only in bsneshle094/sfc/chip: dsp4
Only in bsneshle094/sfc/chip: sgb-external
Only in bsneshle094/sfc/chip: st0010
diff -ru higan_v094-source/sfc/cpu/cpu.cpp bsneshle094/sfc/cpu/cpu.cpp
--- higan_v094-source/sfc/cpu/cpu.cpp 2013-11-09 06:38:15.000000000 +0100
+++ bsneshle094/sfc/cpu/cpu.cpp 2014-05-03 20:02:53.027110040 +0200
@@ -114,9 +114,9 @@
reader = [](unsigned addr) { return cpu.wram[addr]; };
writer = [](unsigned addr, uint8 data) { cpu.wram[addr] = data; };
- bus.map(reader, writer, 0x00, 0x3f, 0x0000, 0x1fff, 0x002000);
- bus.map(reader, writer, 0x80, 0xbf, 0x0000, 0x1fff, 0x002000);
- bus.map(reader, writer, 0x7e, 0x7f, 0x0000, 0xffff, 0x020000);
+ bus.map(reader, writer, 0x00, 0x3f, 0x0000, 0x1fff, 0x002000, 0,0, Cartridge::Mapping::fastmode_readwrite, cpu.wram);
+ bus.map(reader, writer, 0x80, 0xbf, 0x0000, 0x1fff, 0x002000, 0,0, Cartridge::Mapping::fastmode_readwrite, cpu.wram);
+ bus.map(reader, writer, 0x7e, 0x7f, 0x0000, 0xffff, 0x020000, 0,0, Cartridge::Mapping::fastmode_readwrite, cpu.wram);
}
void CPU::power() {
diff -ru higan_v094-source/sfc/cpu/timing/timing.hpp bsneshle094/sfc/cpu/timing/timing.hpp
--- higan_v094-source/sfc/cpu/timing/timing.hpp 2010-12-26 16:16:47.000000000 +0100
+++ bsneshle094/sfc/cpu/timing/timing.hpp 2014-05-26 23:52:03.147625704 +0200
@@ -1,7 +1,7 @@
//timing.cpp
unsigned dma_counter();
-void add_clocks(unsigned clocks);
+alwaysinline void add_clocks(unsigned clocks);
void scanline();
alwaysinline void alu_edge();
diff -ru higan_v094-source/sfc/interface/interface.hpp bsneshle094/sfc/interface/interface.hpp
--- higan_v094-source/sfc/interface/interface.hpp 2013-12-17 05:31:06.000000000 +0100
+++ bsneshle094/sfc/interface/interface.hpp 2014-08-19 15:43:19.689782088 +0200
@@ -88,6 +88,25 @@
};
};
+struct Alt {
+ enum : unsigned {
+ ForDSP,
+ ForSuperGameBoy,
+ };
+ struct DSP {
+ enum : unsigned {
+ LLE,
+ HLE,
+ };
+ };
+ struct SuperGameBoy {
+ enum : unsigned {
+ Internal,
+ External,
+ };
+ };
+};
+
struct Interface : Emulator::Interface {
string title();
double videoFrequency();
diff -ru higan_v094-source/sfc/Makefile bsneshle094/sfc/Makefile
--- higan_v094-source/sfc/Makefile 2013-01-23 00:07:55.000000000 +0100
+++ bsneshle094/sfc/Makefile 2014-08-19 15:32:41.245770102 +0200
@@ -9,6 +9,9 @@
sfc_objects += sfc-spc7110 sfc-sdd1 sfc-obc1
sfc_objects += sfc-hsu1 sfc-msu1
sfc_objects += sfc-satellaviewcart sfc-sufamiturbo
+sfc_objects += sfc-hledsp1 sfc-hledsp2 sfc-hledsp3 sfc-hledsp4
+sfc_objects += sfc-hlecx4 sfc-hlest0010
+sfc_objects += sfc-sgbexternal
objects += $(sfc_objects)
ifeq ($(profile),accuracy)
@@ -70,3 +73,13 @@
obj/sfc-satellaviewcart.o: $(sfc)/slot/satellaview/satellaview.cpp $(call rwildcard,$(sfc)/slot/satellaview/)
obj/sfc-sufamiturbo.o: $(sfc)/slot/sufamiturbo/sufamiturbo.cpp $(call rwildcard,$(sfc)/slot/sufamiturbo/)
+
+obj/sfc-hledsp1.o: $(sfc)/chip/dsp1/dsp1.cpp $(sfc)/chip/dsp1/*
+obj/sfc-hledsp2.o: $(sfc)/chip/dsp2/dsp2.cpp $(sfc)/chip/dsp2/*
+obj/sfc-hledsp3.o: $(sfc)/chip/dsp3/dsp3.cpp $(sfc)/chip/dsp3/*
+obj/sfc-hledsp4.o: $(sfc)/chip/dsp4/dsp4.cpp $(sfc)/chip/dsp4/*
+
+obj/sfc-hlecx4.o: $(sfc)/chip/cx4/cx4.cpp $(sfc)/chip/cx4/*
+obj/sfc-hlest0010.o: $(sfc)/chip/st0010/st0010.cpp $(sfc)/chip/st0010/*
+
+obj/sfc-sgbexternal.o: $(sfc)/chip/sgb-external/sgb-external.cpp $(sfc)/chip/sgb-external/*
diff -ru higan_v094-source/sfc/memory/memory.cpp bsneshle094/sfc/memory/memory.cpp
--- higan_v094-source/sfc/memory/memory.cpp 2013-05-05 09:29:50.000000000 +0200
+++ bsneshle094/sfc/memory/memory.cpp 2014-06-05 22:10:02.955293881 +0200
@@ -1,6 +1,7 @@
#include <sfc/sfc.hpp>
#define MEMORY_CPP
+
namespace SuperFamicom {
Bus bus;
@@ -10,22 +11,73 @@
const function<void (unsigned, uint8)>& writer,
unsigned banklo, unsigned bankhi,
unsigned addrlo, unsigned addrhi,
- unsigned size, unsigned base, unsigned mask
+ unsigned size, unsigned base, unsigned mask,
+ unsigned fastmode, uint8* fastptr
) {
assert(banklo <= bankhi && banklo <= 0xff);
assert(addrlo <= addrhi && addrlo <= 0xffff);
assert(idcount < 255);
+ bool do_fast=(size%(addrhi+1-addrlo)==0 && !((mask|addrlo|addrhi|size)&fast_page_size_mask));
+ bool do_fast_read =(fastmode!=Cartridge::Mapping::fastmode_slow && do_fast);
+ bool do_fast_write=(fastmode==Cartridge::Mapping::fastmode_readwrite && do_fast);
+ for(unsigned bank = banklo; bank <= bankhi; bank++) {
+ for(unsigned addr = addrlo&~fast_page_size_mask; addr<=addrhi; addr+=fast_page_size) {
+ unsigned origpos = (bank << 16 | addr);
+ unsigned fastoffset = origpos >> fast_page_size_bits;
+
+ unsigned accesspos = reduce(origpos, mask);
+ if(size) accesspos = base + mirror(accesspos, size - base);
+ if(do_fast_read) fast_read[fastoffset] = fastptr - origpos + accesspos;
+ else fast_read[fastoffset] = NULL;
+ if(do_fast_write) fast_write[fastoffset] = fastptr - origpos + accesspos;
+ else fast_write[fastoffset] = NULL;
+ }
+ }
+
+#ifdef __LIBRETRO__
+ if (((banklo&-banklo)|0x01000000)>(bankhi-banklo) && (bankhi&(bankhi+1)&~banklo)==0 &&
+ ((addrlo&-addrlo)|0x01000000)>(addrhi-addrlo) && (addrhi&(addrhi+1)&~addrlo)==0)
+ {
+ retro_memory_descriptor desc;
+ desc.flags=(fastmode==Cartridge::Mapping::fastmode_readwrite ? 0 : RETRO_MEMDESC_CONST);
+ desc.ptr=fastptr;
+ desc.offset=0;
+ desc.start=banklo<<16 | addrlo;
+ desc.select=(banklo<<16 | addrlo) ^ (bankhi<<16 | addrhi) ^ 0xFFFFFF;
+ desc.disconnect=mask;
+ desc.len=size;
+ if (!size) desc.len=0x01000000;
+ desc.addrspace=NULL;
+ libretro_mem_map.append(desc);
+ }
+#endif
+
unsigned id = idcount++;
this->reader[id] = reader;
this->writer[id] = writer;
- for(unsigned bank = banklo; bank <= bankhi; bank++) {
- for(unsigned addr = addrlo; addr <= addrhi; addr++) {
- unsigned offset = reduce(bank << 16 | addr, mask);
- if(size) offset = base + mirror(offset, size - base);
- lookup[bank << 16 | addr] = id;
- target[bank << 16 | addr] = offset;
+ if (!(mask & (addrlo^addrhi)) && size%(addrhi+1-addrlo)==0) {
+ //fastpath for common cases
+ for(unsigned bank = banklo; bank <= bankhi; bank++) {
+ unsigned offset = reduce(bank << 16 | addrlo, mask);
+ if (size) offset = base + mirror(offset, size - base);
+ unsigned pos = (bank<<16 | addrlo);
+ unsigned end = (bank<<16 | addrhi);
+ while (pos <= end) {
+ lookup[pos] = id;
+ target[pos] = offset++;
+ pos++;
+ }
+ }
+ } else {
+ for(unsigned bank = banklo; bank <= bankhi; bank++) {
+ for(unsigned addr = addrlo; addr <= addrhi; addr++) {
+ unsigned offset = reduce(bank << 16 | addr, mask);
+ if(size) offset = base + mirror(offset, size - base);
+ lookup[bank << 16 | addr] = id;
+ target[bank << 16 | addr] = offset;
+ }
}
}
}
@@ -34,6 +86,10 @@
function<uint8 (unsigned)> reader = [](unsigned) { return cpu.regs.mdr; };
function<void (unsigned, uint8)> writer = [](unsigned, uint8) {};
+#ifdef __LIBRETRO__
+ libretro_mem_map.reset();
+#endif
+
idcount = 0;
map(reader, writer, 0x00, 0xff, 0x0000, 0xffff);
}
@@ -51,7 +107,7 @@
unsigned bankhi = hex(bankpart(1, bankpart(0)));
unsigned addrlo = hex(addrpart(0));
unsigned addrhi = hex(addrpart(1, addrpart(0)));
- map(m.reader, m.writer, banklo, bankhi, addrlo, addrhi, m.size, m.base, m.mask);
+ map(m.reader, m.writer, banklo, bankhi, addrlo, addrhi, m.size, m.base, m.mask, m.fastmode, m.fastptr);
}
}
}
diff -ru higan_v094-source/sfc/memory/memory.hpp bsneshle094/sfc/memory/memory.hpp
--- higan_v094-source/sfc/memory/memory.hpp 2013-05-05 09:30:28.000000000 +0200
+++ bsneshle094/sfc/memory/memory.hpp 2014-06-05 21:25:47.259294198 +0200
@@ -1,7 +1,12 @@
+#ifdef __LIBRETRO__
+#include "../../target-libretro/libretro.h"
+#endif
+
struct Memory {
virtual inline unsigned size() const;
virtual uint8 read(unsigned addr) = 0;
virtual void write(unsigned addr, uint8 data) = 0;
+ virtual uint8* data() { return NULL; }
};
struct StaticRAM : Memory {
@@ -56,12 +61,19 @@
function<uint8 (unsigned)> reader[256];
function<void (unsigned, uint8)> writer[256];
+ static const uint32 fast_page_size_bits = 13;//keep at 13 or lower so the RAM mirrors can be on the fast path
+ static const uint32 fast_page_size = (1 << fast_page_size_bits);
+ static const uint32 fast_page_size_mask = (fast_page_size - 1);
+ uint8* fast_read[0x1000000>>fast_page_size_bits];
+ uint8* fast_write[0x1000000>>fast_page_size_bits];
+
void map(
const function<uint8 (unsigned)>& reader,
const function<void (unsigned, uint8)>& writer,
unsigned banklo, unsigned bankhi,
unsigned addrlo, unsigned addrhi,
- unsigned size = 0, unsigned base = 0, unsigned mask = 0
+ unsigned size = 0, unsigned base = 0, unsigned mask = 0,
+ unsigned fastmode = 0, uint8* fast_ptr = NULL
);
void map_reset();
@@ -69,6 +81,10 @@
Bus();
~Bus();
+
+#ifdef __LIBRETRO__
+ vector<retro_memory_descriptor> libretro_mem_map;
+#endif
};
extern Bus bus;
diff -ru higan_v094-source/sfc/memory/memory-inline.hpp bsneshle094/sfc/memory/memory-inline.hpp
--- higan_v094-source/sfc/memory/memory-inline.hpp 2014-01-13 07:27:34.000000000 +0100
+++ bsneshle094/sfc/memory/memory-inline.hpp 2014-05-13 17:48:18.379765481 +0200
@@ -73,26 +73,38 @@
return base;
}
-unsigned Bus::reduce(unsigned addr, unsigned mask) {
- unsigned result = 0, length = 0;
- for(unsigned n = 0; n < 24; n++) {
- unsigned bit = 1 << n;
- if(mask & bit) continue;
- result |= (bool)(addr & bit) << length++;
+unsigned Bus::reduce(unsigned addr, unsigned mask)
+{
+ while (mask)
+ {
+ //extract the bits to keep
+ //set everything below the lowest set bit; 0x018000 -> 0x007FFF
+ unsigned tmp=((mask-1)&(~mask));
+
+ //shift everything above that
+ addr=(addr&tmp)|((addr>>1)&~tmp);
+
+ //adjust the mask
+ mask=(mask&(mask-1))>>1;
}
- return result;
+ return addr;
}
uint8 Bus::read(unsigned addr) {
- uint8 data = reader[lookup[addr]](target[addr]);
+ uint8 data;
+ if (fast_read[addr>>fast_page_size_bits]) data = fast_read[addr>>fast_page_size_bits][addr];
+ else data = reader[lookup[addr]](target[addr]);
+#ifndef __LIBRETRO__
if(cheat.enable()) {
if(auto result = cheat.find(addr, data)) return result();
}
+#endif
return data;
}
void Bus::write(unsigned addr, uint8 data) {
- return writer[lookup[addr]](target[addr], data);
+ if (fast_write[addr>>fast_page_size_bits]) fast_write[addr>>fast_page_size_bits][addr] = data;
+ else writer[lookup[addr]](target[addr], data);
}
diff -ru higan_v094-source/sfc/ppu/background/background.hpp bsneshle094/sfc/ppu/background/background.hpp
--- higan_v094-source/sfc/ppu/background/background.hpp 2013-05-05 09:31:28.000000000 +0200
+++ bsneshle094/sfc/ppu/background/background.hpp 2014-05-03 23:18:53.731330831 +0200
@@ -60,21 +60,21 @@
uint8 data[8];
};
- void frame();
- void scanline();
- void begin();
- void run(bool screen);
- void reset();
+ inline void frame();
+ inline void scanline();
+ inline void begin();
+ inline void run(bool screen);
+ inline void reset();
- void get_tile();
- unsigned get_tile_color();
- unsigned get_tile(unsigned x, unsigned y);
- signed clip(signed n);
- void begin_mode7();
- void run_mode7();
+ inline void get_tile();
+ inline unsigned get_tile_color();
+ inline unsigned get_tile(unsigned x, unsigned y);
+ inline signed clip(signed n);
+ inline void begin_mode7();
+ inline void run_mode7();
- void serialize(serializer&);
- Background(PPU& self, unsigned id);
+ inline void serialize(serializer&);
+ inline Background(PPU& self, unsigned id);
PPU& self;
friend class PPU;
diff -ru higan_v094-source/sfc/ppu/screen/screen.hpp bsneshle094/sfc/ppu/screen/screen.hpp
--- higan_v094-source/sfc/ppu/screen/screen.hpp 2013-05-05 09:36:42.000000000 +0200
+++ bsneshle094/sfc/ppu/screen/screen.hpp 2014-05-03 23:19:20.659331336 +0200
@@ -29,19 +29,19 @@
bool color_halve;
} math;
- void scanline();
- void run();
- void reset();
+ inline void scanline();
+ inline void run();
+ inline void reset();
- uint16 get_pixel_sub(bool hires);
- uint16 get_pixel_main();
- uint16 addsub(unsigned x, unsigned y);
- uint16 get_color(unsigned palette);
- uint16 get_direct_color(unsigned palette, unsigned tile);
- uint16 fixed_color() const;
+ inline uint16 get_pixel_sub(bool hires);
+ inline uint16 get_pixel_main();
+ inline uint16 addsub(unsigned x, unsigned y);
+ inline uint16 get_color(unsigned palette);
+ inline uint16 get_direct_color(unsigned palette, unsigned tile);
+ inline uint16 fixed_color() const;
- void serialize(serializer&);
- Screen(PPU& self);
+ inline void serialize(serializer&);
+ inline Screen(PPU& self);
PPU& self;
friend class PPU;
diff -ru higan_v094-source/sfc/ppu/sprite/sprite.hpp bsneshle094/sfc/ppu/sprite/sprite.hpp
--- higan_v094-source/sfc/ppu/sprite/sprite.hpp 2013-05-05 09:37:44.000000000 +0200
+++ bsneshle094/sfc/ppu/sprite/sprite.hpp 2014-05-03 23:18:08.691329985 +0200
@@ -60,22 +60,22 @@
} output;
//list.cpp
- void update(unsigned addr, uint8 data);
- void synchronize();
+ inline void update(unsigned addr, uint8 data);
+ inline void synchronize();
//sprite.cpp
- void address_reset();
- void set_first_sprite();
- void frame();
- void scanline();
- void run();
- void tilefetch();
- void reset();
+ inline void address_reset();
+ inline void set_first_sprite();
+ inline void frame();
+ inline void scanline();
+ inline void run();
+ inline void tilefetch();
+ inline void reset();
- bool on_scanline(SpriteItem&);
+ inline bool on_scanline(SpriteItem&);
- void serialize(serializer&);
- Sprite(PPU& self);
+ inline void serialize(serializer&);
+ inline Sprite(PPU& self);
PPU& self;
friend class PPU;
diff -ru higan_v094-source/sfc/ppu/window/window.hpp bsneshle094/sfc/ppu/window/window.hpp
--- higan_v094-source/sfc/ppu/window/window.hpp 2013-05-05 09:40:42.000000000 +0200
+++ bsneshle094/sfc/ppu/window/window.hpp 2014-05-03 23:19:37.315331649 +0200
@@ -69,19 +69,19 @@
bool two;
};
- void scanline();
- void run();
- void reset();
+ inline void scanline();
+ inline void run();
+ inline void reset();
- void test(
+ inline void test(
bool& main, bool& sub,
bool one_enable, bool one_invert,
bool two_enable, bool two_invert,
uint8 mask, bool main_enable, bool sub_enable
);
- void serialize(serializer&);
- Window(PPU& self);
+ inline void serialize(serializer&);
+ inline Window(PPU& self);
PPU& self;
friend class PPU;
diff -ru higan_v094-source/sfc/system/serialization.cpp bsneshle094/sfc/system/serialization.cpp
--- higan_v094-source/sfc/system/serialization.cpp 2013-05-05 09:48:32.000000000 +0200
+++ bsneshle094/sfc/system/serialization.cpp 2014-08-19 16:07:51.405809717 +0200
@@ -73,6 +73,13 @@
if(cartridge.has_hsu1()) hsu1.serialize(s);
if(cartridge.has_msu1()) msu1.serialize(s);
if(cartridge.has_st_slots()) sufamiturboA.serialize(s), sufamiturboB.serialize(s);
+ if(cartridge.has_dsp1()) dsp1.serialize(s);
+ if(cartridge.has_dsp2()) dsp2.serialize(s);
+ //if(cartridge.has_dsp3()) dsp3.serialize(s);
+ //if(cartridge.has_dsp4()) dsp4.serialize(s);
+ if(cartridge.has_cx4()) cx4.serialize(s);
+ if(cartridge.has_st0010()) st0010.serialize(s);
+ if(cartridge.has_sgbexternal()) sgbExternal.serialize(s);
}
//perform dry-run state save:
diff -ru higan_v094-source/sfc/system/system.cpp bsneshle094/sfc/system/system.cpp
--- higan_v094-source/sfc/system/system.cpp 2014-01-13 07:06:55.000000000 +0100
+++ bsneshle094/sfc/system/system.cpp 2014-08-19 17:20:40.337891738 +0200
@@ -83,6 +83,14 @@
msu1.init();
satellaviewcartridge.init();
+ dsp1.init();
+ dsp2.init();
+ dsp3.init();
+ dsp4.init();
+ cx4.init();
+ st0010.init();
+ sgbExternal.init();
+
video.init();
audio.init();
@@ -94,6 +102,9 @@