Skip to content

Commit bf28a6a

Browse files
opcmopcm
authored
Merge pull request #114 from opcm/push_201901
Push 201901
2 parents 86d7d99 + 741a3e4 commit bf28a6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1795
-1175
lines changed

‎Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ LIB= -lpthread -lc++
4949
CXXFLAGS += -std=c++11
5050
endif
5151

52-
COMMON_OBJS = msr.o cpucounters.o pci.o client_bw.o utils.o
52+
COMMON_OBJS = msr.o cpucounters.o pci.o mmio.o client_bw.o utils.o
5353
EXE_OBJS = $(EXE:.x=.o)
5454
OBJS = $(COMMON_OBJS) $(EXE_OBJS)
5555

@@ -80,6 +80,9 @@ libPCM.a: $(COMMON_OBJS)
8080
sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
8181
@rm -f $*.d.tmp
8282

83+
memoptest.x: memoptest.cpp
84+
g++ -Wall -g -O0 -std=c++11 memoptest.cpp -o memoptest.x
85+
8386
nice:
8487
uncrustify --replace -c ~/uncrustify.cfg *.cpp *.h WinMSRDriver/Win7/*.h WinMSRDriver/Win7/*.c WinMSRDriver/WinXP/*.h WinMSRDriver/WinXP/*.c PCM_Win/*.h PCM_Win/*.cpp
8588

‎PCM-Core_Win/pcm-core-win.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<ClCompile Include="..\msr.cpp" />
156156
<ClCompile Include="..\pci.cpp" />
157157
<ClCompile Include="..\winpmem\winpmem.cpp" />
158-
<ClCompile Include="..\client_bw.cpp" />
158+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
159159
<ClCompile Include="..\freegetopt\getopt.cpp" />
160160
<ClCompile Include="pcm-core-win.cpp" />
161161
<ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
169169
<ClInclude Include="..\cpucounters.h" />
170170
<ClInclude Include="..\msr.h" />
171171
<ClInclude Include="..\pci.h" />
172-
<ClInclude Include="..\client_bw.h" />
172+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
173173
<ClInclude Include="stdafx.h" />
174174
<ClInclude Include="..\types.h" />
175175
<ClInclude Include="windriver.h" />

‎PCM-IIO_Win/pcm-iio-win.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<ClCompile Include="..\msr.cpp" />
156156
<ClCompile Include="..\pci.cpp" />
157157
<ClCompile Include="..\winpmem\winpmem.cpp" />
158-
<ClCompile Include="..\client_bw.cpp" />
158+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
159159
<ClCompile Include="..\freegetopt\getopt.cpp" />
160160
<ClCompile Include="pcm-iio-win.cpp" />
161161
<ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
169169
<ClInclude Include="..\cpucounters.h" />
170170
<ClInclude Include="..\msr.h" />
171171
<ClInclude Include="..\pci.h" />
172-
<ClInclude Include="..\client_bw.h" />
172+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
173173
<ClInclude Include="stdafx.h" />
174174
<ClInclude Include="..\types.h" />
175175
<ClInclude Include="windriver.h" />

‎PCM-LSPCI_Win/pcm-lspci-win.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<ClCompile Include="..\msr.cpp" />
156156
<ClCompile Include="..\pci.cpp" />
157157
<ClCompile Include="..\winpmem\winpmem.cpp" />
158-
<ClCompile Include="..\client_bw.cpp" />
158+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
159159
<ClCompile Include="..\freegetopt\getopt.cpp" />
160160
<ClCompile Include="pcm-lspci-win.cpp" />
161161
<ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
169169
<ClInclude Include="..\cpucounters.h" />
170170
<ClInclude Include="..\msr.h" />
171171
<ClInclude Include="..\pci.h" />
172-
<ClInclude Include="..\client_bw.h" />
172+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
173173
<ClInclude Include="stdafx.h" />
174174
<ClInclude Include="..\types.h" />
175175
<ClInclude Include="windriver.h" />

‎PCM-Latency_Win/pcm-latency-win.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<ClCompile Include="..\msr.cpp" />
156156
<ClCompile Include="..\pci.cpp" />
157157
<ClCompile Include="..\winpmem\winpmem.cpp" />
158-
<ClCompile Include="..\client_bw.cpp" />
158+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
159159
<ClCompile Include="..\freegetopt\getopt.cpp" />
160160
<ClCompile Include="pcm-latency-win.cpp" />
161161
<ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
169169
<ClInclude Include="..\cpucounters.h" />
170170
<ClInclude Include="..\msr.h" />
171171
<ClInclude Include="..\pci.h" />
172-
<ClInclude Include="..\client_bw.h" />
172+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
173173
<ClInclude Include="stdafx.h" />
174174
<ClInclude Include="..\types.h" />
175175
<ClInclude Include="windriver.h" />

‎PCM-Lib_Win/pcm-lib.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
<ClCompile Include="..\winpmem\winpmem.cpp" />
191191
<ClCompile Include="..\msr.cpp" />
192192
<ClCompile Include="..\pci.cpp" />
193-
<ClCompile Include="..\client_bw.cpp" />
193+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
194194
<ClCompile Include="..\utils.cpp" />
195195
<ClCompile Include="..\PCM_Win\restrictDriverAccess.cpp">
196196
<CompileAsManaged>true</CompileAsManaged>
@@ -202,7 +202,7 @@
202202
<ClInclude Include="pcm-lib.h" />
203203
<ClInclude Include="..\msr.h" />
204204
<ClInclude Include="..\pci.h" />
205-
<ClInclude Include="..\client_bw.h" />
205+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
206206
<ClInclude Include="targetver.h" />
207207
</ItemGroup>
208208
<ItemGroup>

‎PCM-MSR_Win/pcm-msr-win.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<ClCompile Include="..\cpucounters.cpp" />
155155
<ClCompile Include="..\msr.cpp" />
156156
<ClCompile Include="..\pci.cpp" />
157-
<ClCompile Include="..\client_bw.cpp" />
157+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
158158
<ClCompile Include="..\freegetopt\getopt.cpp" />
159159
<ClCompile Include="pcm-msr-win.cpp" />
160160
<ClCompile Include="..\winpmem\winpmem.cpp" />
@@ -169,7 +169,7 @@
169169
<ClInclude Include="..\cpucounters.h" />
170170
<ClInclude Include="..\msr.h" />
171171
<ClInclude Include="..\pci.h" />
172-
<ClInclude Include="..\client_bw.h" />
172+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
173173
<ClInclude Include="stdafx.h" />
174174
<ClInclude Include="..\types.h" />
175175
<ClInclude Include="windriver.h" />

‎PCM-Memory_Win/pcm-memory-win.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<ClCompile Include="..\cpucounters.cpp" />
155155
<ClCompile Include="..\msr.cpp" />
156156
<ClCompile Include="..\pci.cpp" />
157-
<ClCompile Include="..\client_bw.cpp" />
157+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
158158
<ClCompile Include="..\freegetopt\getopt.cpp" />
159159
<ClCompile Include="pcm-memory-win.cpp" />
160160
<ClCompile Include="..\winpmem\winpmem.cpp" />
@@ -169,7 +169,7 @@
169169
<ClInclude Include="..\cpucounters.h" />
170170
<ClInclude Include="..\msr.h" />
171171
<ClInclude Include="..\pci.h" />
172-
<ClInclude Include="..\client_bw.h" />
172+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
173173
<ClInclude Include="stdafx.h" />
174174
<ClInclude Include="..\types.h" />
175175
<ClInclude Include="windriver.h" />

‎PCM-NUMA_Win/pcm-numa-win.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<ClCompile Include="..\cpucounters.cpp" />
155155
<ClCompile Include="..\msr.cpp" />
156156
<ClCompile Include="..\pci.cpp" />
157-
<ClCompile Include="..\client_bw.cpp" />
157+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
158158
<ClCompile Include="..\freegetopt\getopt.cpp" />
159159
<ClCompile Include="pcm-numa-win.cpp" />
160160
<ClCompile Include="..\winpmem\winpmem.cpp" />
@@ -169,7 +169,7 @@
169169
<ClInclude Include="..\cpucounters.h" />
170170
<ClInclude Include="..\msr.h" />
171171
<ClInclude Include="..\pci.h" />
172-
<ClInclude Include="..\client_bw.h" />
172+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
173173
<ClInclude Include="stdafx.h" />
174174
<ClInclude Include="..\types.h" />
175175
<ClInclude Include="windriver.h" />

‎PCM-PCICFG_Win/pcm-pcicfg-win.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<ClCompile Include="..\msr.cpp" />
156156
<ClCompile Include="..\pci.cpp" />
157157
<ClCompile Include="..\winpmem\winpmem.cpp" />
158-
<ClCompile Include="..\client_bw.cpp" />
158+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
159159
<ClCompile Include="..\freegetopt\getopt.cpp" />
160160
<ClCompile Include="pcm-pcicfg-win.cpp" />
161161
<ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
169169
<ClInclude Include="..\cpucounters.h" />
170170
<ClInclude Include="..\msr.h" />
171171
<ClInclude Include="..\pci.h" />
172-
<ClInclude Include="..\client_bw.h" />
172+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
173173
<ClInclude Include="stdafx.h" />
174174
<ClInclude Include="..\types.h" />
175175
<ClInclude Include="windriver.h" />

‎PCM-PCIE_Win/pcm-pcie-win.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<ClCompile Include="..\cpucounters.cpp" />
155155
<ClCompile Include="..\msr.cpp" />
156156
<ClCompile Include="..\pci.cpp" />
157-
<ClCompile Include="..\client_bw.cpp" />
157+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
158158
<ClCompile Include="..\freegetopt\getopt.cpp" />
159159
<ClCompile Include="pcm-pcie-win.cpp" />
160160
<ClCompile Include="..\winpmem\winpmem.cpp" />
@@ -169,7 +169,7 @@
169169
<ClInclude Include="..\cpucounters.h" />
170170
<ClInclude Include="..\msr.h" />
171171
<ClInclude Include="..\pci.h" />
172-
<ClInclude Include="..\client_bw.h" />
172+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
173173
<ClInclude Include="stdafx.h" />
174174
<ClInclude Include="..\types.h" />
175175
<ClInclude Include="windriver.h" />

‎PCM-Power_Win/pcm-power-win.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<ClCompile Include="..\msr.cpp" />
156156
<ClCompile Include="..\pci.cpp" />
157157
<ClCompile Include="..\winpmem\winpmem.cpp" />
158-
<ClCompile Include="..\client_bw.cpp" />
158+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
159159
<ClCompile Include="..\freegetopt\getopt.cpp" />
160160
<ClCompile Include="pcm-power-win.cpp" />
161161
<ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
169169
<ClInclude Include="..\cpucounters.h" />
170170
<ClInclude Include="..\msr.h" />
171171
<ClInclude Include="..\pci.h" />
172-
<ClInclude Include="..\client_bw.h" />
172+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
173173
<ClInclude Include="stdafx.h" />
174174
<ClInclude Include="..\types.h" />
175175
<ClInclude Include="windriver.h" />

‎PCM-TSX_Win/pcm-tsx-win.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<ClCompile Include="..\cpucounters.cpp" />
155155
<ClCompile Include="..\msr.cpp" />
156156
<ClCompile Include="..\pci.cpp" />
157-
<ClCompile Include="..\client_bw.cpp" />
157+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
158158
<ClCompile Include="..\freegetopt\getopt.cpp" />
159159
<ClCompile Include="pcm-tsx-win.cpp" />
160160
<ClCompile Include="..\winpmem\winpmem.cpp" />
@@ -169,7 +169,7 @@
169169
<ClInclude Include="..\cpucounters.h" />
170170
<ClInclude Include="..\msr.h" />
171171
<ClInclude Include="..\pci.h" />
172-
<ClInclude Include="..\client_bw.h" />
172+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
173173
<ClInclude Include="stdafx.h" />
174174
<ClInclude Include="..\types.h" />
175175
<ClInclude Include="windriver.h" />

‎PCM_Win/pcm.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<ClCompile Include="..\winpmem\winpmem.cpp" />
156156
<ClCompile Include="..\msr.cpp" />
157157
<ClCompile Include="..\pci.cpp" />
158-
<ClCompile Include="..\client_bw.cpp" />
158+
<ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
159159
<ClCompile Include="pcm.cpp" />
160160
<ClCompile Include="restrictDriverAccess.cpp">
161161
<CompileAsManaged>true</CompileAsManaged>
@@ -168,7 +168,7 @@
168168
<ClInclude Include="..\cpucounters.h" />
169169
<ClInclude Include="..\msr.h" />
170170
<ClInclude Include="..\pci.h" />
171-
<ClInclude Include="..\client_bw.h" />
171+
<ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
172172
<ClInclude Include="stdafx.h" />
173173
<ClInclude Include="..\types.h" />
174174
<ClInclude Include="windriver.h" />

‎WinMSRDriver/Win7/msrmain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2009-2012, Intel Corporation
2+
Copyright (c) 2009-2018, Intel Corporation
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

0 commit comments

Comments
 (0)